PPC. Jobs add thread column.

Related Work Items: #8458

1 files changed, 29 insertions, 3 deletions

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)))