From c1d16392f2414775a2e3a1b1b948021a022e9359 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 29 May 2023 13:49:47 +0300
Subject: PPC. Jobs add thread column.

Related Work Items: #8458
---
 .../Tango.PPC.UI/Models/MachineOverviewModel.cs    | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
index bd34122c6..579aa57f4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
@@ -56,7 +56,7 @@ namespace Tango.PPC.UI.Models
         public void Update(StartDiagnosticsResponse diagnostics, Rml rml, ProcessParametersTable processParameters)
         {
             //Dryer Zone 3
-            var dryerZone3State = diagnostics.HeatersStates.FirstOrDefault(x => x.HeaterType == HeaterType.HeaterZone3);
+            var dryerZone3State = diagnostics.HeatersStates.FirstOrDefault(x => x.HeaterType == HeaterType.EDryerHeater3);
             UpdateHeaterItem(DryerZone3, dryerZone3State);
 
             //Dryer Air
@@ -72,7 +72,26 @@ namespace Tango.PPC.UI.Models
             //Pumps Pressure
             if (diagnostics.Monitors.EuInkLinesPressure.Count > 0 && diagnostics.Monitors.EuInkLinesPressure.Any(x => x.Data.Count > 0))
             {
-                var pumpsPressuerValue = diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max();
+                //EuDispenser1Pressure
+                List<double> EuDispensersPressure = new List<double>();
+                var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser1PressureValue);
+                var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser2PressureValue);
+                var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser3PressureValue);
+                var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser4PressureValue);
+                var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser5PressureValue);
+                var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser6PressureValue);
+                var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser7PressureValue);
+                var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault();
+                EuDispensersPressure.Add(EuDispenser8PressureValue);
+
+                var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max();
                 UpdatePumpsPressureItem(pumpsPressuerValue);
             }
 
@@ -101,7 +120,14 @@ namespace Tango.PPC.UI.Models
                     item.Status = "Operational";
                     item.Color = Colors.Green;
                     item.DisplayValue = $" {state.SetPoint}";
-                    item.MaxValue = state.SetPoint;
+                    if(state.SetPoint == 0 && state.CurrentValue == 0)
+                    {
+                        item.MaxValue = 10;
+                    }
+                    else
+                    { 
+                        item.MaxValue = state.SetPoint;
+                    }
                     item.Value = state.CurrentValue;
                 }
                 else if (!state.IsRampingUp && (state.CurrentValue < (state.SetPoint - 10) || state.CurrentValue > (state.SetPoint + 10)))
-- 
cgit v1.3.1


From 218794a0207ccb6e89a9a3c7175180001ae03740 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 1 Jun 2023 15:48:54 +0300
Subject: PPC. GUI bugs,.

Related Work Items: #8497, #8509, #8512
---
 .../Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs      | 52 ++++++++++++++++++++++
 .../Tango.PPC.JobsV2/Views/JobEurekaView.xaml      | 22 ++++-----
 .../Modules/Tango.PPC.JobsV2/Views/JobsView.xaml   | 23 +++-------
 .../Tango.PPC.MachineSettings/Views/MainView.xaml  |  2 +-
 .../Tango.PPC.UI/Models/MachineOverviewModel.cs    | 13 ++++--
 .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml  |  8 ++--
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |  3 ++
 .../Tango.Integration/Operation/JobHandler.cs      |  6 +--
 8 files changed, 88 insertions(+), 41 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
index df3ae4596..e5e41b382 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
@@ -225,6 +225,11 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public RelayCommand ExportJobCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the move to list ( History or Draft) jobs command.
+        /// </summary>
+        public RelayCommand MoveToListJobsCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -251,6 +256,7 @@ namespace Tango.PPC.Jobs.ViewModels
             DeleteJobsCommand = new RelayCommand(() => DeleteJobs(SelectedJobs));
             CloneJobsCommand = new RelayCommand(() => CloneJobs(SelectedJobs));
             ExportJobCommand = new RelayCommand(ExportJob);
+            MoveToListJobsCommand = new RelayCommand(() => MoveToListJobs(SelectedJobs));
 
             RegisterForMessage<JobRemovedMessage>(HandleJobRemovedMessage);
             RegisterForMessage<JobSavedMessage>(HandleJobSavedMessage);
@@ -643,6 +649,52 @@ namespace Tango.PPC.Jobs.ViewModels
             }
         }
 
+        /// <summary>
+        /// Moves to list (Draft/History) jobs.
+        /// </summary>
+        /// <param name="jobs">The jobs.</param>
+        private async void MoveToListJobs(ObservableCollection<Job> jobs)
+        {
+            bool isHistory = SelectedCategory == JobsCategory.History;
+            string list = isHistory ? "Draft" : "History";
+            try
+            {
+               
+                LogManager.Log($"Move To {list} selected jobs:\n{jobs.Select(x => x.Name).ToList().ToJsonString()}");
+                
+                foreach (var job in SelectedJobs)
+                {
+                    if(isHistory)
+                    {
+                        if(job.JobStatus != JobStatuses.Draft)
+                        {
+                            job.JobStatus = JobStatuses.Draft;
+                            job.LastUpdated = DateTime.UtcNow;
+                        }
+                    }
+                    if(!isHistory)//draft
+                    {
+                        if(job.JobStatus == JobStatuses.Draft)
+                        {
+                            job.JobStatus = JobStatuses.Completed;
+                            job.LastUpdated = DateTime.UtcNow;
+                        }
+                    }
+                }
+
+                await _db.SaveChangesAsync();
+                
+                HistoryJobsCollectionView.Refresh();
+                DraftJobsCollectionView.Refresh();
+                ClearSelection();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error Move To {list} selected jobs.");
+                await NotificationProvider.ShowError($"An error occurred while trying to Move To {list} the selected jobs.");
+            }
+        }
+
         /// <summary>
         /// Called when the search filter has been changed
         /// </summary>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index a92c950ed..613200c02 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -259,7 +259,7 @@
                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Length, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="100000" 
+                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="1000000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18" ValueChangedEnd="Length_ValueChanged" 
                                                                                    TextGotFocus="Length_BeforeChangeValue" RippleBrush="Transparent"/>
@@ -268,7 +268,7 @@
                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Weight, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="1000" 
+                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="100000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18"  RippleBrush="Transparent"/>
                             </Border>
@@ -887,14 +887,14 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="Copies" FontSize="{StaticResource TangoButtonFontSize}" Width="145"/>
                                 <Border Margin="20 0 0 0" BorderThickness="1"  Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Width="120">
-                                    <touch:TouchNumericTextBox BorderBrush="Transparent" HasDecimalPoint="False" Minimum="4" Step="4" Margin="0 0 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Value="{Binding JobModel.Copies}" HideUnderline="True" RippleBrush="Transparent"></touch:TouchNumericTextBox>
+                                    <touch:TouchNumericTextBox BorderBrush="Transparent" HasDecimalPoint="False" Minimum="4" Maximum="1000000"  Step="4" Margin="0 0 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Value="{Binding JobModel.Copies}" HideUnderline="True" RippleBrush="Transparent"></touch:TouchNumericTextBox>
 
                                 </Border>
                             </StackPanel>
                            
                         </DockPanel>
                         <StackPanel Orientation="Horizontal" Margin="60 0 60 20" Visibility="{Binding IsBasicMode, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                            <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="White Gap (m)" FontSize="{StaticResource TangoButtonFontSize}" Width="145"/>
+                            <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="White Gap(m)" FontSize="{StaticResource TangoButtonFontSize}" Width="145"/>
                             <Border Margin="20 0 0 0" BorderThickness="1"  Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Width="120">
                                 <touch:TouchNumericTextBox BorderBrush="Transparent" HasDecimalPoint="False" Minimum="0" Margin="0 0 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Value="{Binding JobModel.InterSegmentLength}" HideUnderline="True" RippleBrush="Transparent"></touch:TouchNumericTextBox>
 
@@ -1030,7 +1030,7 @@
                                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Length, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="100000" 
+                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="1000000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18" ValueChangedEnd="Length_ValueChanged" 
                                                                                    TextGotFocus="Length_BeforeChangeValue" RippleBrush="Transparent"/>
@@ -1040,7 +1040,7 @@
                                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Weight, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="1000" 
+                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="100000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18"  RippleBrush="Transparent"/>
 
@@ -1193,7 +1193,7 @@
                     <touch:TouchExpander x:Name="summaryExpander" IsExpanded="{Binding IsSummaryOpened, Mode=TwoWay}"  Grid.Row="3" Margin="15 0 15 0 "  FontSize="{StaticResource TangoTitleFontSize}"  BorderThickness="0" Style="{StaticResource TouchRoundedExpander}" CornerRadius="20 20 0 0" Padding="10" IsTabStop="False" >
                         <touch:TouchExpander.Header>
                             <DockPanel Height="84">
-                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 20 0" VerticalAlignment="Center" >
+                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 10 0" VerticalAlignment="Center" >
                                     <StackPanel Orientation="Horizontal" Visibility="{Binding IsSummaryOpened, Converter={StaticResource BooleanToVisibilityInverseConverter}, Mode=TwoWay}">
                                         <TextBlock VerticalAlignment="Center"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Run Text="Copy:" FontWeight="Normal"></Run>
@@ -1212,12 +1212,12 @@
                                                 </Run>
                                             <Run Text="g" FontWeight="DemiBold"></Run>
                                         </TextBlock>
-                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Run Text="Total:" FontWeight="Normal"></Run>
                                              <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
                                              <Run Text="m" FontWeight="Bold"></Run> 
                                         </TextBlock>
-                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <Run Text="Total:" FontWeight="Normal"></Run>
                                             <Run  FontWeight="Bold">
                                                     <Run.Text>
@@ -1230,7 +1230,7 @@
                                              <Run Text="g" FontWeight="Bold"></Run> 
                                         </TextBlock>
                                     </StackPanel>
-                                    <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" FontWeight="Bold" Foreground="{StaticResource TangoDarkForegroundBrush}">
+                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" FontWeight="Bold" Foreground="{StaticResource TangoDarkForegroundBrush}">
                                         <Run Text="Duration: " FontWeight="Normal"></Run>
                                         <Run Text="{Binding JobModel.GetEstimatedDuration, Converter={StaticResource TimeSpanToTwoDigitsTimeConverter}, FallbackValue=0, Mode=OneWay}"></Run>
                                         <Run Text="{Binding JobModel.GetEstimatedDuration, Converter={StaticResource TimeSpanToLabelConverter}, FallbackValue=min, Mode=OneWay}"></Run>
@@ -1238,7 +1238,7 @@
                                 </StackPanel>
                                 <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
                                     <Image Source="../Images/JobView/job-summary.png" Width="39" />
-                                    <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Summary</TextBlock>
+                                    <TextBlock FontWeight="Medium" Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Summary</TextBlock>
                                 </StackPanel>
                             </DockPanel>
                           
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
index 5a64922af..d396b5860 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
@@ -91,26 +91,17 @@
                             </Style.Triggers>
                         </Style>
                     </StackPanel.Style>
-                    <touch:TouchIconButton Command="{Binding ClearSelectionCommand}" Visibility="{Binding IsMultiSelecting,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 0 30 0" Padding="20" Icon="Undo">
+                    <touch:TouchIconButton Command="{Binding ClearSelectionCommand}" Visibility="{Binding IsMultiSelecting,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 0 30 0" Padding="20" Icon="Close" Width="50" Height="50" Style="{StaticResource TangoRoundTouchIconButton}">
+                       
+                    </touch:TouchIconButton>
+                    <touch:TouchIconButton Command="{Binding MoveToListJobsCommand}" Margin="0 0 30 0" Padding="20"  >
                         <touch:TouchIconButton.Style>
                             <Style TargetType="touch:TouchIconButton" BasedOn="{StaticResource TangoRoundTouchIconButton}">
                                 <Setter Property="IconAngle" Value="0"></Setter>
+                                <Setter Property="Icon" Value="Redo"/>
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsMultiSelecting}" Value="True">
-                                        <DataTrigger.EnterActions>
-                                            <BeginStoryboard>
-                                                <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetProperty="IconAngle" To="360" Duration="00:00:0.2"></DoubleAnimation>
-                                                </Storyboard>
-                                            </BeginStoryboard>
-                                        </DataTrigger.EnterActions>
-                                        <DataTrigger.ExitActions>
-                                            <BeginStoryboard>
-                                                <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetProperty="IconAngle" To="0" Duration="00:00:00"></DoubleAnimation>
-                                                </Storyboard>
-                                            </BeginStoryboard>
-                                        </DataTrigger.ExitActions>
+                                    <DataTrigger Binding="{Binding SelectedCategoryIndex}" Value="1">
+                                        <Setter Property="Icon" Value="Undo"/>
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index 6475869dd..764f044d0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -461,7 +461,7 @@
                                         </DockPanel>
 
                                         <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
-                                            <TextBlock VerticalAlignment="Center">Show advanced options (Multi-segments &amp; Gradients) in the Job Editor</TextBlock>
+                                            <TextBlock VerticalAlignment="Center">Show advanced options (Segments &amp; Gradients) in the Job Editor</TextBlock>
                                             <touch:TouchToggleSlider IsChecked="{Binding Settings.ShowAdvancedOptions}" Margin="0 0 100 0" DockPanel.Dock="Right" Style="{StaticResource TangoToggleButtonGrayAccent}" HorizontalAlignment="Right" Width="90"></touch:TouchToggleSlider>
                                         </DockPanel>
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
index 579aa57f4..0030d71aa 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
@@ -198,11 +198,16 @@ namespace Tango.PPC.UI.Models
                 Lubricant.Status = "Active";
                 Lubricant.DisplayValue = lubricantValue.ToString();
                 Lubricant.Color = Colors.Green;
+                return;
             }
-
-            Lubricant.Status = "NotActive";
-            Lubricant.DisplayValue = "None";
-            Lubricant.Color = Colors.Gray;
+            else
+            {
+                Lubricant.Status = "NotActive";
+                Lubricant.DisplayValue = "None";
+                Lubricant.Color = Colors.Gray;
+            }
+            
+            
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 7cb0cc181..adf25eddb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -392,7 +392,7 @@
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
                                     <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length (m)</TextBlock>
                                         <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Style>
                                                 <Style TargetType="{x:Type TextBlock}">
@@ -410,7 +410,7 @@
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
                                     <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight (g)</TextBlock>
                                         <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Style>
                                                 <Style TargetType="{x:Type TextBlock}">
@@ -656,7 +656,7 @@
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
                                     <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock x:Name="ProgressLength"  VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
+                                        <TextBlock x:Name="ProgressLength"  VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length (m)</TextBlock>
                                         <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Text>
                                                 <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
@@ -670,7 +670,7 @@
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
                                     <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight (g)</TextBlock>
                                         <TextBlock   FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Text>
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 0e00bee3e..cf341f439 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -635,6 +635,9 @@ namespace Tango.Emulations.Emulators
                     monitors.Dispenser7MotorFrequency.AddRange(dispenserFrequencies[6].Data);
                     monitors.Dispenser8MotorFrequency.AddRange(dispenserFrequencies[7].Data);
 
+                    monitors.EuLubricantCurrent.Add(4000.0);
+
+
                     //res.HeatersStates.Add(new HeaterState()
                     //{
                     //    CurrentValue = 50,
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 2ceeb8164..23bd2b1ba 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -440,14 +440,10 @@ namespace Tango.Integration.Operation
 
                 Status.CurrentUnitTotalProgress = Status.RemainingUnits > 1 && Job.EnableInterSegment ? Job.Length + (Job.InterSegmentLength) : Job.Length;
 
-                if (s.Message != _lastStatusMessage && s.Message != String.Empty)
+                if (s.Message != _lastStatusMessage )
                 {
                     Status.Message = s.Message;
                 }
-                else
-                {
-                    Status.Message = String.Empty;
-                }
                
                 _lastStatusMessage = s.Message;
 
-- 
cgit v1.3.1


From cdf79876fb6a31c377335a89092216adab05387f Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 4 Jun 2023 11:46:29 +0300
Subject: Bugs - display pressure, fonts

Related Work Items: #8523
---
 .../Modules/Tango.PPC.JobsV2/Views/JobsView.xaml   | 10 ++--
 .../Tango.PPC.UI/Models/MachineOverviewModel.cs    | 61 +++++++++++-----------
 .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml  |  4 +-
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |  5 +-
 4 files changed, 41 insertions(+), 39 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
index d396b5860..0e9e6d617 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
@@ -255,7 +255,7 @@
                             <touch:LightTouchDataGridColumn Width="200" Header="Thread" SortMember="ThreadName" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Margin="5 0 0 0" IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='44'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Margin="5 0 0 0" IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='44'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -285,7 +285,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -364,7 +364,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -378,7 +378,7 @@
                             <touch:LightTouchDataGridColumn Width="200" Header="Thread" SortMember="ThreadName" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Margin="5 0 0 0"  IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='43'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Margin="5 0 0 0"  IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='43'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -407,7 +407,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
index 0030d71aa..faddc5c54 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
@@ -70,30 +70,29 @@ namespace Tango.PPC.UI.Models
             UpdateHeaterItem(Tunnel, tunnelState);
 
             //Pumps Pressure
-            if (diagnostics.Monitors.EuInkLinesPressure.Count > 0 && diagnostics.Monitors.EuInkLinesPressure.Any(x => x.Data.Count > 0))
-            {
-                //EuDispenser1Pressure
-                List<double> EuDispensersPressure = new List<double>();
-                var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser1PressureValue);
-                var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser2PressureValue);
-                var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser3PressureValue);
-                var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser4PressureValue);
-                var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser5PressureValue);
-                var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser6PressureValue);
-                var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser7PressureValue);
-                var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser8PressureValue);
-
-                var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max();
-                UpdatePumpsPressureItem(pumpsPressuerValue);
-            }
+
+            //EuDispenser1Pressure
+            List<double> EuDispensersPressure = new List<double>();
+            var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser1PressureValue);
+            var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser2PressureValue);
+            var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser3PressureValue);
+            var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser4PressureValue);
+            var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser5PressureValue);
+            var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser6PressureValue);
+            var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser7PressureValue);
+            var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser8PressureValue);
+
+            var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max();
+            UpdatePumpsPressureItem(pumpsPressuerValue);
+
 
             //Lubricant
             var lubricantValue = diagnostics.Monitors.EuLubricantCurrent.FirstOrDefault();
@@ -111,7 +110,7 @@ namespace Tango.PPC.UI.Models
                 {
                     item.Status = "Heating Up";
                     item.Color = Colors.Orange;
-                    item.DisplayValue = $"{state.CurrentValue} / {state.SetPoint}";
+                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}";
                     item.MaxValue = state.SetPoint;
                     item.Value = state.CurrentValue;
                 }
@@ -134,7 +133,7 @@ namespace Tango.PPC.UI.Models
                 {
                     item.Status = "Over-temperature";
                     item.Color = Colors.Red;
-                    item.DisplayValue = $"{state.CurrentValue} / {state.SetPoint}";
+                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}";
                     item.MaxValue = state.SetPoint;
                     item.Value = state.CurrentValue > state.SetPoint? state.SetPoint : state.CurrentValue;
                 }
@@ -153,13 +152,13 @@ namespace Tango.PPC.UI.Models
             {
                 DryerAir.Status = "Heating Up";
                 DryerAir.Color = Colors.Orange;
-                DryerAir.DisplayValue = $"{currentvalue}";
+                DryerAir.DisplayValue = currentvalue.ToString("N1");
             }
             else if (currentvalue >= DryerAirMaxValue)
             {
                 DryerAir.Status = "Operational";
                 DryerAir.Color = Colors.Green;
-                DryerAir.DisplayValue = $"{currentvalue}";
+                DryerAir.DisplayValue = currentvalue.ToString("N1");
             }
             DryerAir.Value = currentvalue;
         }
@@ -170,13 +169,13 @@ namespace Tango.PPC.UI.Models
             {
                 PumpsPressure.Status = "Overpressure";
                 PumpsPressure.Color = Colors.Red;
-                PumpsPressure.DisplayValue = maxValue.ToString();
+                PumpsPressure.DisplayValue = maxValue.ToString("N1");
             }
             else
             {
                 PumpsPressure.Status = "Operational";
                 PumpsPressure.Color = Colors.Green;
-                PumpsPressure.DisplayValue = maxValue.ToString();
+                PumpsPressure.DisplayValue = maxValue.ToString("N1");
             }
             PumpsPressure.Value = maxValue;
         }
@@ -196,7 +195,7 @@ namespace Tango.PPC.UI.Models
                     return;
                 }
                 Lubricant.Status = "Active";
-                Lubricant.DisplayValue = lubricantValue.ToString();
+                Lubricant.DisplayValue = lubricantValue.ToString("N1");
                 Lubricant.Color = Colors.Green;
                 return;
             }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index adf25eddb..8e7a6918b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -367,7 +367,7 @@
                                         <Rectangle Height="3" Fill="{StaticResource TangoPrimaryAccentBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0"></Rectangle>
                                     </StackPanel>
                                 </touch:TouchButton>
-                                <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TangoLargeHeaderFontSize}" Text="{Binding Job.Name, TargetNullValue='-', FallbackValue='-'}"></TextBlock>
+                                <TextBlock DockPanel.Dock="Left" FontSize="28" Text="{Binding Job.Name, TargetNullValue='-', FallbackValue='-'}"></TextBlock>
                             </DockPanel>
                             <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                         </Grid>
@@ -1011,7 +1011,7 @@
                                                     <SolidColorBrush Color="{Binding Lubricant.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue}">
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue, StringFormat=0.## }">
                                                 <TextBlock.Foreground>
                                                     <SolidColorBrush Color="{Binding Lubricant.Color}"/>
                                                 </TextBlock.Foreground>
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index cf341f439..5b17ac49d 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -635,7 +635,10 @@ namespace Tango.Emulations.Emulators
                     monitors.Dispenser7MotorFrequency.AddRange(dispenserFrequencies[6].Data);
                     monitors.Dispenser8MotorFrequency.AddRange(dispenserFrequencies[7].Data);
 
-                    monitors.EuLubricantCurrent.Add(4000.0);
+                    monitors.EuDispenser1Pressure.Clear();
+                    monitors.EuDispenser1Pressure.Add(5);
+
+                    monitors.EuLubricantCurrent.Add(4000.12345);
 
 
                     //res.HeatersStates.Add(new HeaterState()
-- 
cgit v1.3.1


From 2b1c20945dc03d5136fba48ee9d165b412620e66 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 8 Jun 2023 09:37:17 +0300
Subject: PPC. Resize the font and change color for Sensors display values.

Related Work Items: #8551
---
 .../Tango.PPC.JobsV2/Views/JobEurekaView.xaml      |  2 +-
 .../PPC/Tango.PPC.UI/Models/MachineOverviewItem.cs |  8 ++++
 .../Tango.PPC.UI/Models/MachineOverviewModel.cs    | 12 +++---
 .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml  | 48 ++++++++++++----------
 .../Tango.Emulations/Emulators/MachineEmulator.cs  | 15 +++++++
 5 files changed, 58 insertions(+), 27 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index c31c8036d..165f251c3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -1192,7 +1192,7 @@
                 <Border Grid.Row="2" Margin="0 0 0 0" BorderThickness="0">
                     <touch:TouchExpander x:Name="summaryExpander" IsExpanded="{Binding IsSummaryOpened, Mode=TwoWay}"  Grid.Row="3" Margin="15 0 15 0 "  FontSize="{StaticResource TangoTitleFontSize}"  BorderThickness="0" Style="{StaticResource TouchRoundedExpander}" CornerRadius="20 20 0 0" Padding="10" IsTabStop="False" >
                         <touch:TouchExpander.Header>
-                            <DockPanel Height="84">
+                            <DockPanel Height="80">
                                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 10 0" VerticalAlignment="Center" >
                                     <StackPanel Orientation="Horizontal" Visibility="{Binding IsSummaryOpened, Converter={StaticResource BooleanToVisibilityInverseConverter}, Mode=TwoWay}">
                                         <TextBlock VerticalAlignment="Center"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewItem.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewItem.cs
index ded7e33e8..42f6bd180 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewItem.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewItem.cs
@@ -17,6 +17,13 @@ namespace Tango.PPC.UI.Models
             set { _displayValue = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _displayMaxValue;
+        public String DisplayMaxValue
+        {
+            get { return _displayMaxValue; }
+            set { _displayMaxValue = value; RaisePropertyChangedAuto(); }
+        }
+
         private String _status;
         public String Status
         {
@@ -53,6 +60,7 @@ namespace Tango.PPC.UI.Models
             DisplayValue = "--";
             Value  = 0;
             MaxValue = 100;
+            DisplayMaxValue = "";
         }
 
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
index faddc5c54..beba47246 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
@@ -110,15 +110,17 @@ namespace Tango.PPC.UI.Models
                 {
                     item.Status = "Heating Up";
                     item.Color = Colors.Orange;
-                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}";
+                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")}";
+                    item.DisplayMaxValue = $"/{state.SetPoint}";
                     item.MaxValue = state.SetPoint;
                     item.Value = state.CurrentValue;
                 }
-                else if (state.SetPoint == 0 || (state.CurrentValue >= (state.SetPoint - 10) || state.CurrentValue <= (state.SetPoint + 10)))
+                else if (state.SetPoint == 0 || (state.CurrentValue >= (state.SetPoint - 10) && state.CurrentValue <= (state.SetPoint + 10)))
                 {
                     item.Status = "Operational";
                     item.Color = Colors.Green;
                     item.DisplayValue = $" {state.SetPoint}";
+                    item.DisplayMaxValue = "";
                     if(state.SetPoint == 0 && state.CurrentValue == 0)
                     {
                         item.MaxValue = 10;
@@ -133,7 +135,8 @@ namespace Tango.PPC.UI.Models
                 {
                     item.Status = "Over-temperature";
                     item.Color = Colors.Red;
-                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}";
+                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")}";
+                    item.DisplayMaxValue = $"/{state.SetPoint}";
                     item.MaxValue = state.SetPoint;
                     item.Value = state.CurrentValue > state.SetPoint? state.SetPoint : state.CurrentValue;
                 }
@@ -142,6 +145,7 @@ namespace Tango.PPC.UI.Models
                     item.Color = Colors.Gray;
                     item.MaxValue = 100;
                     item.Value = 0;
+                    item.DisplayMaxValue = "";
                 }
             }
         }
@@ -205,8 +209,6 @@ namespace Tango.PPC.UI.Models
                 Lubricant.DisplayValue = "None";
                 Lubricant.Color = Colors.Gray;
             }
-            
-            
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 536682bf9..1445337ad 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -1021,12 +1021,15 @@
                                                     <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Text="{Binding DryerZone3.DisplayValue}">
-                                                <TextBlock.Foreground>
-                                                    <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
-                                                </TextBlock.Foreground>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="Bold" >
+                                                 <Run Text="{Binding DryerZone3.DisplayValue}">
+                                                    <Run.Foreground>
+                                                         <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
+                                                    </Run.Foreground>
+                                                </Run>
+                                                <Run Text="{Binding DryerZone3.DisplayMaxValue}" ></Run>
                                             </TextBlock>
-                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" >&#186;C</TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" >&#186;C</TextBlock>
 
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 3</TextBlock>
@@ -1039,12 +1042,12 @@
                                                     <SolidColorBrush Color="{Binding DryerAir.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding DryerAir.DisplayValue}">
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="{Binding DryerAir.DisplayValue}">
                                                 <TextBlock.Foreground>
                                                     <SolidColorBrush Color="{Binding DryerAir.Color}"/>
                                                 </TextBlock.Foreground>
                                             </TextBlock>
-                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C" >
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="&#186;C" >
                                             </TextBlock>
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Air</TextBlock>
@@ -1056,12 +1059,15 @@
                                                     <SolidColorBrush Color="{Binding Tunnel.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Tunnel.DisplayValue}">
-                                                <TextBlock.Foreground>
-                                                    <SolidColorBrush Color="{Binding Tunnel.Color}"/>
-                                                </TextBlock.Foreground>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" >
+                                                <Run Text="{Binding Tunnel.DisplayValue}">
+                                                    <Run.Foreground>
+                                                         <SolidColorBrush Color="{Binding Tunnel.Color}"/>
+                                                    </Run.Foreground>
+                                                </Run>
+                                                <Run Text="{Binding Tunnel.DisplayMaxValue}" ></Run>
                                             </TextBlock>
-                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Tunnel</TextBlock>
@@ -1073,12 +1079,12 @@
                                                     <SolidColorBrush Color="{Binding PumpsPressure.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding PumpsPressure.DisplayValue}">
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="{Binding PumpsPressure.DisplayValue}">
                                                 <TextBlock.Foreground>
                                                     <SolidColorBrush Color="{Binding PumpsPressure.Color}"/>
                                                 </TextBlock.Foreground>
                                             </TextBlock>
-                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="Bar"></TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="Bar"></TextBlock>
 
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Pumps pressure</TextBlock>
@@ -1090,12 +1096,12 @@
                                                     <SolidColorBrush Color="{Binding Lubricant.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue, StringFormat=0.## }">
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue, StringFormat=0.## }">
                                                 <TextBlock.Foreground>
                                                     <SolidColorBrush Color="{Binding Lubricant.Color}"/>
                                                 </TextBlock.Foreground>
                                             </TextBlock>
-                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="mVolts"></TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Text="mVolts"></TextBlock>
 
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Lubricant</TextBlock>
@@ -1200,8 +1206,8 @@
                     </Grid>
                 </Grid>
             </Grid>
-            <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 2 0">
-                <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0 0 0 0" CornerRadius="20 20 0 0" Margin="0 0 0 -1" IsExpanded="{Binding IsExpandedNotifications, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 10 0">
+                <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" CornerRadius="20 20 0 0" Margin="0 0 0 -1" IsExpanded="{Binding IsExpandedNotifications, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                     <touch:TouchExpander.Header>
                         <DockPanel >
                             <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" Command="{Binding ClearAllNotificationsCommand}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}" >
@@ -1244,7 +1250,7 @@
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
-                                    <Grid HorizontalAlignment="Stretch"  Height="90">
+                                    <Grid HorizontalAlignment="Stretch"  Height="60">
                                         <Border BorderThickness="1" Margin="-1 0 0 0" BorderBrush="{StaticResource TangoDividerBrush}">
                                             <Grid HorizontalAlignment="Stretch" >
                                                 <Grid.ColumnDefinitions>
@@ -1283,8 +1289,8 @@
                                                 </touch:TouchIcon>
                                                 
                                                 <StackPanel Margin="15 3 10 5" VerticalAlignment="Center" Grid.Column="1">
-                                                    <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Center" ></TextBlock>
-                                                    <TextBlock Margin="0 5 0 0"  Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" FontSize="{StaticResource TangoSmallFontSize}" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                                    <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Top" ></TextBlock>
+                                                    <TextBlock Margin="0 3 0 0"  Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" FontSize="{StaticResource TangoSmallFontSize}" TextWrapping="NoWrap" VerticalAlignment="Center" HorizontalAlignment="Left" TextTrimming="CharacterEllipsis"/>
                                                 </StackPanel>
                                                
                                                 <Grid Grid.Column="2" Width="40" HorizontalAlignment="Right" VerticalAlignment="Stretch" Visibility="{Binding CanClose,Converter={StaticResource BooleanToVisibilityConverter}}">
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 5b17ac49d..41884a24c 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -227,6 +227,21 @@ namespace Tango.Emulations.Emulators
                     HeaterType = (HeaterType)item.Code,
                 });
             }
+            var tunnel = _heater_states.FirstOrDefault(x => x.HeaterType == HeaterType.ETunnelHeater);
+            if(tunnel != null)
+            {
+                tunnel.IsRampingUp = true;
+                tunnel.CurrentValue = 108.5;
+                tunnel.SetPoint = 170;
+            }
+            var dryerZone3 = _heater_states.FirstOrDefault(x => x.HeaterType == HeaterType.EDryerHeater3);
+            if (dryerZone3 != null)
+            {
+                dryerZone3.IsRampingUp = false;
+                dryerZone3.CurrentValue = 200.8;
+                dryerZone3.SetPoint = 170;
+            }
+            //DryerZone3
 
             foreach (var item in adapter.HardwareBlowerTypes)
             {
-- 
cgit v1.3.1