From bf432bf7b7faa7c51e74462e19eb3e50c28b4aa8 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 22 Jan 2020 18:00:55 +0200
Subject: Implemented StringFormat control for db properties. Added
 StringFormat 0.000 for FeederTension on ProcessParameters.

---
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 3e6ffd396..b49f1407c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1553,7 +1553,7 @@
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
                                                                                                     <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
-                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
+                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="{Binding StringFormat}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
                                                                                         </Grid>
-- 
cgit v1.3.1


From 60a2692fd4acadfdf8724bb198e38a2689a866fd Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 23 Jan 2020 14:34:55 +0200
Subject: Added new staple spun process parameters to database, BL and PMR.
 Implemented process params index via db. Added new process params in MS.
 Added JOB_RUN => Upload time, Heating Time, IsGradient...

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../PMR/Messages/Hardware/HardwareBlower.proto     |   1 -
 .../PMR/Messages/Printing/ProcessParameters.proto  |  16 +
 .../Views/JobView.xaml                             |  20 +-
 .../Views/JobView.xaml.cs                          |  40 --
 .../Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs    |  40 ++
 .../Tango.BL/DTO/ProcessParametersTableDTOBase.cs  |  64 ++++
 .../Visual_Studio/Tango.BL/Entities/JobRunBase.cs  | 177 +++++++++
 .../Entities/ProcessParametersTableBase.cs         | 414 +++++++++++++++++++++
 .../DbPropertyExtensionModel.cs                    |   6 +
 .../Templates/EntityCodeFile.cshtml                |   6 +
 .../CustomAttributes/PropertyIndexAttribute.cs     |  24 ++
 .../ExtensionMethods/IParameterizedExtensions.cs   |  11 +-
 .../Visual_Studio/Tango.Core/Tango.Core.csproj     |   1 +
 .../Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs  |   5 +
 .../DB/PROCESS_PARAMETERS_TABLES.cs                |   8 +
 .../Tango.DAL.Remote/DB/RemoteADO.Designer.cs      |   2 +-
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |  39 ++
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 156 ++++----
 .../Tango.PMR/Hardware/HardwareBlower.cs           |   3 -
 .../Tango.PMR/Printing/ProcessParameters.cs        | 236 +++++++++++-
 .../Utilities/Tango.PMRGenerator.CLI/Program.cs    |   6 +-
 23 files changed, 1132 insertions(+), 143 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.Core/CustomAttributes/PropertyIndexAttribute.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 934e928ac..92607a44c 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 236d08381..b0d5a8efe 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/PMR/Messages/Hardware/HardwareBlower.proto b/Software/PMR/Messages/Hardware/HardwareBlower.proto
index 0d5aadac1..f628fea36 100644
--- a/Software/PMR/Messages/Hardware/HardwareBlower.proto
+++ b/Software/PMR/Messages/Hardware/HardwareBlower.proto
@@ -22,7 +22,6 @@ message HardwareBlower
 
     bool Enabled = 2;
 
-    //Voltage Description
     double Voltage = 3;
 
     double HeatingVoltage = 4;
diff --git a/Software/PMR/Messages/Printing/ProcessParameters.proto b/Software/PMR/Messages/Printing/ProcessParameters.proto
index 042f63264..013549907 100644
--- a/Software/PMR/Messages/Printing/ProcessParameters.proto
+++ b/Software/PMR/Messages/Printing/ProcessParameters.proto
@@ -56,4 +56,20 @@ message ProcessParameters
 
     int32 TableIndex = 20;
 
+    double HeadZone7Temp = 21;
+
+    double HeadZone8Temp = 22;
+
+    double HeadZone9Temp = 23;
+
+    double HeadZone10Temp = 24;
+
+    double HeadZone11Temp = 25;
+
+    double HeadZone12Temp = 26;
+
+    double StSpZone1Temp = 27;
+
+    double StSpZone2Temp = 28;
+
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index b49f1407c..47cb41522 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -791,9 +791,9 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
@@ -1403,7 +1403,7 @@
                 <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
-                            <Setter Property="Width" Value="520"></Setter>
+                            <Setter Property="Width" Value="640"></Setter>
                             <Setter Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
@@ -1541,7 +1541,7 @@
 
 
                                                                             </WrapPanel.Resources>
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}" GeneratingItems="ParameterizedEditor_GeneratingItems">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
                                                                                 <editors:ParameterizedEditor.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
                                                                                         <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
@@ -1549,7 +1549,7 @@
                                                                                 </editors:ParameterizedEditor.ItemsPanel>
                                                                                 <editors:ParameterizedEditor.DoubleTemplate>
                                                                                     <DataTemplate>
-                                                                                        <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
+                                                                                        <Grid Background="Transparent">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
                                                                                                     <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
@@ -1609,16 +1609,17 @@
 
                                                 <StackPanel Orientation="Horizontal">
                                                     <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
-                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                    <TextBlock Margin="5 3 0 0">Use Recommended Process Parameters (auto)</TextBlock>
                                                 </StackPanel>
 
-                                                <StackPanel Margin="0 40 0 0" Orientation="Horizontal" HorizontalAlignment="Right">
-                                                    <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                <Grid Margin="0 40 0 0" >
+                                                    <Button HorizontalAlignment="Left" Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
                                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
                                                         </TextBlock>
                                                     </Button>
-                                                    <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                                        <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                         <StackPanel Orientation="Horizontal">
                                                             <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
                                                             <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
@@ -1631,6 +1632,7 @@
                                                         </StackPanel>
                                                     </Button>
                                                 </StackPanel>
+                                                </Grid>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 28e488aae..a4a8fdcf4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -159,46 +159,6 @@ namespace Tango.MachineStudio.Developer.Views
             e.Handled = true;
         }
 
-        private void ParameterizedEditor_GeneratingItems(object sender, SharedUI.Editors.ParameterizedEditor.GeneratingItemsEventArgs e)
-        {
-            var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
-
-            List<ParameterItem> items = e.Result.ToList();
-
-            if (settings.ProcessParametersIndices.Count > 0)
-            {
-                items.Clear();
-
-                foreach (var item in settings.ProcessParametersIndices.OrderBy(x => x.Index))
-                {
-                    var p = e.Source.SingleOrDefault(x => x.Name == item.Name);
-
-                    if (p != null)
-                    {
-                        items.Add(p);
-                    }
-                }
-            }
-            else
-            {
-                ProcessParametersTable p = new ProcessParametersTable();
-                var pp = p.CreateParametersCollection(Core.ParameterItemMode.Binding);
-
-                foreach (var item in pp)
-                {
-                    settings.ProcessParametersIndices.Add(new ParameterIndex()
-                    {
-                        Index = pp.IndexOf(item),
-                        Name = item.Name
-                    });
-                }
-
-                settings.Save();
-            }
-
-            e.Result = items;
-        }
-
         private void OnProcessParameterDropped(object sender, DropEventArgs e)
         {
             ParameterItem draggedItem = e.Draggable.DataContext as ParameterItem;
diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
index 61d36d1e5..83e04fde0 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
@@ -37,6 +37,14 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// user guid
+        /// </summary>
+        public String UserGuid 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// job name
         /// </summary>
@@ -69,6 +77,30 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// uploading start date
+        /// </summary>
+        public Nullable<DateTime> UploadingStartDate 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// heating start date
+        /// </summary>
+        public Nullable<DateTime> HeatingStartDate 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// actual start date
+        /// </summary>
+        public Nullable<DateTime> ActualStartDate 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// end date
         /// </summary>
@@ -93,6 +125,14 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// is gradient
+        /// </summary>
+        public Boolean IsGradient 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// liquid quantity string
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs
index e8892c64a..155da6cdd 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs
@@ -197,5 +197,69 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// head zone7 temp
+        /// </summary>
+        public Double HeadZone7Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// head zone8 temp
+        /// </summary>
+        public Double HeadZone8Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// head zone9 temp
+        /// </summary>
+        public Double HeadZone9Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// head zone10 temp
+        /// </summary>
+        public Double HeadZone10Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// head zone11 temp
+        /// </summary>
+        public Double HeadZone11Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// head zone12 temp
+        /// </summary>
+        public Double HeadZone12Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// st sp zone1 temp
+        /// </summary>
+        public Double StSpZone1Temp 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// st sp zone2 temp
+        /// </summary>
+        public Double StSpZone2Temp 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index 7d56f3fa8..32efcdd9e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -35,12 +35,20 @@ namespace Tango.BL.Entities
 
         public event EventHandler<DateTime> StartDateChanged;
 
+        public event EventHandler<Nullable<DateTime>> UploadingStartDateChanged;
+
+        public event EventHandler<Nullable<DateTime>> HeatingStartDateChanged;
+
+        public event EventHandler<Nullable<DateTime>> ActualStartDateChanged;
+
         public event EventHandler<DateTime> EndDateChanged;
 
         public event EventHandler<Int32> StatusChanged;
 
         public event EventHandler<Double> JobLengthChanged;
 
+        public event EventHandler<Boolean> IsGradientChanged;
+
         public event EventHandler<String> LiquidQuantityStringChanged;
 
         public event EventHandler<Double> EndPositionChanged;
@@ -99,6 +107,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _userguid;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase user guid.
+        /// </summary>
+
+        [Column("USER_GUID")]
+
+        public  String UserGuid
+        {
+            get 
+            {
+                return _userguid; 
+            }
+
+            set 
+            {
+                if (_userguid != value)
+                {
+                    _userguid = value;
+
+                }
+            }
+        }
+
         protected String _jobname;
 
         /// <summary>
@@ -207,6 +240,87 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Nullable<DateTime> _uploadingstartdate;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase uploading start date.
+        /// </summary>
+
+        [Column("UPLOADING_START_DATE")]
+
+        public  Nullable<DateTime> UploadingStartDate
+        {
+            get 
+            {
+                return _uploadingstartdate; 
+            }
+
+            set 
+            {
+                if (_uploadingstartdate != value)
+                {
+                    _uploadingstartdate = value;
+
+                    OnUploadingStartDateChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<DateTime> _heatingstartdate;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase heating start date.
+        /// </summary>
+
+        [Column("HEATING_START_DATE")]
+
+        public  Nullable<DateTime> HeatingStartDate
+        {
+            get 
+            {
+                return _heatingstartdate; 
+            }
+
+            set 
+            {
+                if (_heatingstartdate != value)
+                {
+                    _heatingstartdate = value;
+
+                    OnHeatingStartDateChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<DateTime> _actualstartdate;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase actual start date.
+        /// </summary>
+
+        [Column("ACTUAL_START_DATE")]
+
+        public  Nullable<DateTime> ActualStartDate
+        {
+            get 
+            {
+                return _actualstartdate; 
+            }
+
+            set 
+            {
+                if (_actualstartdate != value)
+                {
+                    _actualstartdate = value;
+
+                    OnActualStartDateChanged(value);
+
+                }
+            }
+        }
+
         protected DateTime _enddate;
 
         /// <summary>
@@ -290,6 +404,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Boolean _isgradient;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase is gradient.
+        /// </summary>
+
+        [Column("IS_GRADIENT")]
+
+        public  Boolean IsGradient
+        {
+            get 
+            {
+                return _isgradient; 
+            }
+
+            set 
+            {
+                if (_isgradient != value)
+                {
+                    _isgradient = value;
+
+                    OnIsGradientChanged(value);
+
+                }
+            }
+        }
+
         protected String _liquidquantitystring;
 
         /// <summary>
@@ -434,6 +575,33 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(StartDate));
         }
 
+        /// <summary>
+        /// Called when the UploadingStartDate has changed.
+        /// </summary>
+        protected virtual void OnUploadingStartDateChanged(Nullable<DateTime> uploadingstartdate)
+        {
+            UploadingStartDateChanged?.Invoke(this, uploadingstartdate);
+            RaisePropertyChanged(nameof(UploadingStartDate));
+        }
+
+        /// <summary>
+        /// Called when the HeatingStartDate has changed.
+        /// </summary>
+        protected virtual void OnHeatingStartDateChanged(Nullable<DateTime> heatingstartdate)
+        {
+            HeatingStartDateChanged?.Invoke(this, heatingstartdate);
+            RaisePropertyChanged(nameof(HeatingStartDate));
+        }
+
+        /// <summary>
+        /// Called when the ActualStartDate has changed.
+        /// </summary>
+        protected virtual void OnActualStartDateChanged(Nullable<DateTime> actualstartdate)
+        {
+            ActualStartDateChanged?.Invoke(this, actualstartdate);
+            RaisePropertyChanged(nameof(ActualStartDate));
+        }
+
         /// <summary>
         /// Called when the EndDate has changed.
         /// </summary>
@@ -461,6 +629,15 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(JobLength));
         }
 
+        /// <summary>
+        /// Called when the IsGradient has changed.
+        /// </summary>
+        protected virtual void OnIsGradientChanged(Boolean isgradient)
+        {
+            IsGradientChanged?.Invoke(this, isgradient);
+            RaisePropertyChanged(nameof(IsGradient));
+        }
+
         /// <summary>
         /// Called when the LiquidQuantityString has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs
index 1cc189e70..8682b5b5a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs
@@ -69,6 +69,22 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> TableIndexChanged;
 
+        public event EventHandler<Double> HeadZone7TempChanged;
+
+        public event EventHandler<Double> HeadZone8TempChanged;
+
+        public event EventHandler<Double> HeadZone9TempChanged;
+
+        public event EventHandler<Double> HeadZone10TempChanged;
+
+        public event EventHandler<Double> HeadZone11TempChanged;
+
+        public event EventHandler<Double> HeadZone12TempChanged;
+
+        public event EventHandler<Double> StSpZone1TempChanged;
+
+        public event EventHandler<Double> StSpZone2TempChanged;
+
         public event EventHandler<ProcessParametersTablesGroup> ProcessParametersTablesGroupChanged;
 
         protected String _name;
@@ -79,6 +95,10 @@ namespace Tango.BL.Entities
 
         [Column("NAME")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(1)]
+
         public  String Name
         {
             get 
@@ -106,6 +126,10 @@ namespace Tango.BL.Entities
 
         [Column("DYEING_SPEED")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(2)]
+
         public  Double DyeingSpeed
         {
             get 
@@ -133,6 +157,10 @@ namespace Tango.BL.Entities
 
         [Column("MIN_INK_UPTAKE")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(3)]
+
         public  Double MinInkUptake
         {
             get 
@@ -160,6 +188,10 @@ namespace Tango.BL.Entities
 
         [Column("MAX_INK_UPTAKE")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(4)]
+
         public  Double MaxInkUptake
         {
             get 
@@ -189,6 +221,8 @@ namespace Tango.BL.Entities
 
         [StringFormat("0.000")]
 
+        [PropertyIndex(5)]
+
         public  Double FeederTension
         {
             get 
@@ -216,6 +250,10 @@ namespace Tango.BL.Entities
 
         [Column("PULLER_TENSION")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(6)]
+
         public  Double PullerTension
         {
             get 
@@ -243,6 +281,10 @@ namespace Tango.BL.Entities
 
         [Column("WINDER_TENSION")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(7)]
+
         public  Double WinderTension
         {
             get 
@@ -270,6 +312,10 @@ namespace Tango.BL.Entities
 
         [Column("MIXER_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(8)]
+
         public  Double MixerTemp
         {
             get 
@@ -297,6 +343,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_ZONE1_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(9)]
+
         public  Double HeadZone1Temp
         {
             get 
@@ -324,6 +374,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_ZONE2_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(10)]
+
         public  Double HeadZone2Temp
         {
             get 
@@ -351,6 +405,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_ZONE3_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(11)]
+
         public  Double HeadZone3Temp
         {
             get 
@@ -378,6 +436,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_ZONE4_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(12)]
+
         public  Double HeadZone4Temp
         {
             get 
@@ -405,6 +467,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_ZONE5_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(13)]
+
         public  Double HeadZone5Temp
         {
             get 
@@ -432,6 +498,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_ZONE6_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(14)]
+
         public  Double HeadZone6Temp
         {
             get 
@@ -459,6 +529,10 @@ namespace Tango.BL.Entities
 
         [Column("DRYER_AIR_FLOW")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(26)]
+
         public  Double DryerAirFlow
         {
             get 
@@ -486,6 +560,10 @@ namespace Tango.BL.Entities
 
         [Column("DRYER_ZONE1_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(23)]
+
         public  Double DryerZone1Temp
         {
             get 
@@ -513,6 +591,10 @@ namespace Tango.BL.Entities
 
         [Column("DRYER_ZONE2_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(24)]
+
         public  Double DryerZone2Temp
         {
             get 
@@ -540,6 +622,10 @@ namespace Tango.BL.Entities
 
         [Column("DRYER_ZONE3_TEMP")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(25)]
+
         public  Double DryerZone3Temp
         {
             get 
@@ -567,6 +653,10 @@ namespace Tango.BL.Entities
 
         [Column("DRYER_BUFFER_LENGTH")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(28)]
+
         public  Double DryerBufferLength
         {
             get 
@@ -594,6 +684,10 @@ namespace Tango.BL.Entities
 
         [Column("HEAD_AIR_FLOW")]
 
+        [StringFormat("0.0")]
+
+        [PropertyIndex(27)]
+
         public  Double HeadAirFlow
         {
             get 
@@ -666,6 +760,254 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _headzone7temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase head zone7 temp.
+        /// </summary>
+
+        [Column("HEAD_ZONE7_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(15)]
+
+        public  Double HeadZone7Temp
+        {
+            get 
+            {
+                return _headzone7temp; 
+            }
+
+            set 
+            {
+                if (_headzone7temp != value)
+                {
+                    _headzone7temp = value;
+
+                    OnHeadZone7TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _headzone8temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase head zone8 temp.
+        /// </summary>
+
+        [Column("HEAD_ZONE8_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(16)]
+
+        public  Double HeadZone8Temp
+        {
+            get 
+            {
+                return _headzone8temp; 
+            }
+
+            set 
+            {
+                if (_headzone8temp != value)
+                {
+                    _headzone8temp = value;
+
+                    OnHeadZone8TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _headzone9temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase head zone9 temp.
+        /// </summary>
+
+        [Column("HEAD_ZONE9_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(17)]
+
+        public  Double HeadZone9Temp
+        {
+            get 
+            {
+                return _headzone9temp; 
+            }
+
+            set 
+            {
+                if (_headzone9temp != value)
+                {
+                    _headzone9temp = value;
+
+                    OnHeadZone9TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _headzone10temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase head zone10 temp.
+        /// </summary>
+
+        [Column("HEAD_ZONE10_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(18)]
+
+        public  Double HeadZone10Temp
+        {
+            get 
+            {
+                return _headzone10temp; 
+            }
+
+            set 
+            {
+                if (_headzone10temp != value)
+                {
+                    _headzone10temp = value;
+
+                    OnHeadZone10TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _headzone11temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase head zone11 temp.
+        /// </summary>
+
+        [Column("HEAD_ZONE11_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(19)]
+
+        public  Double HeadZone11Temp
+        {
+            get 
+            {
+                return _headzone11temp; 
+            }
+
+            set 
+            {
+                if (_headzone11temp != value)
+                {
+                    _headzone11temp = value;
+
+                    OnHeadZone11TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _headzone12temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase head zone12 temp.
+        /// </summary>
+
+        [Column("HEAD_ZONE12_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(20)]
+
+        public  Double HeadZone12Temp
+        {
+            get 
+            {
+                return _headzone12temp; 
+            }
+
+            set 
+            {
+                if (_headzone12temp != value)
+                {
+                    _headzone12temp = value;
+
+                    OnHeadZone12TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _stspzone1temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase st sp zone1 temp.
+        /// </summary>
+
+        [Column("ST_SP_ZONE1_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(21)]
+
+        public  Double StSpZone1Temp
+        {
+            get 
+            {
+                return _stspzone1temp; 
+            }
+
+            set 
+            {
+                if (_stspzone1temp != value)
+                {
+                    _stspzone1temp = value;
+
+                    OnStSpZone1TempChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _stspzone2temp;
+
+        /// <summary>
+        /// Gets or sets the processparameterstablebase st sp zone2 temp.
+        /// </summary>
+
+        [Column("ST_SP_ZONE2_TEMP")]
+
+        [StringFormat("0.0")]
+
+        [PropertyIndex(22)]
+
+        public  Double StSpZone2Temp
+        {
+            get 
+            {
+                return _stspzone2temp; 
+            }
+
+            set 
+            {
+                if (_stspzone2temp != value)
+                {
+                    _stspzone2temp = value;
+
+                    OnStSpZone2TempChanged(value);
+
+                }
+            }
+        }
+
         protected ProcessParametersTablesGroup _processparameterstablesgroup;
 
         /// <summary>
@@ -887,6 +1229,78 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(TableIndex));
         }
 
+        /// <summary>
+        /// Called when the HeadZone7Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone7TempChanged(Double headzone7temp)
+        {
+            HeadZone7TempChanged?.Invoke(this, headzone7temp);
+            RaisePropertyChanged(nameof(HeadZone7Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone8Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone8TempChanged(Double headzone8temp)
+        {
+            HeadZone8TempChanged?.Invoke(this, headzone8temp);
+            RaisePropertyChanged(nameof(HeadZone8Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone9Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone9TempChanged(Double headzone9temp)
+        {
+            HeadZone9TempChanged?.Invoke(this, headzone9temp);
+            RaisePropertyChanged(nameof(HeadZone9Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone10Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone10TempChanged(Double headzone10temp)
+        {
+            HeadZone10TempChanged?.Invoke(this, headzone10temp);
+            RaisePropertyChanged(nameof(HeadZone10Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone11Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone11TempChanged(Double headzone11temp)
+        {
+            HeadZone11TempChanged?.Invoke(this, headzone11temp);
+            RaisePropertyChanged(nameof(HeadZone11Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone12Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone12TempChanged(Double headzone12temp)
+        {
+            HeadZone12TempChanged?.Invoke(this, headzone12temp);
+            RaisePropertyChanged(nameof(HeadZone12Temp));
+        }
+
+        /// <summary>
+        /// Called when the StSpZone1Temp has changed.
+        /// </summary>
+        protected virtual void OnStSpZone1TempChanged(Double stspzone1temp)
+        {
+            StSpZone1TempChanged?.Invoke(this, stspzone1temp);
+            RaisePropertyChanged(nameof(StSpZone1Temp));
+        }
+
+        /// <summary>
+        /// Called when the StSpZone2Temp has changed.
+        /// </summary>
+        protected virtual void OnStSpZone2TempChanged(Double stspzone2temp)
+        {
+            StSpZone2TempChanged?.Invoke(this, stspzone2temp);
+            RaisePropertyChanged(nameof(StSpZone2Temp));
+        }
+
         /// <summary>
         /// Called when the ProcessParametersTablesGroup has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs
index 873aabe1e..c02094273 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs
@@ -12,6 +12,7 @@ namespace Tango.CodeGeneration
         public double Min { get; set; }
         public double Max { get; set; }
         public String StringFormat { get; set; }
+        public int? Index { get; set; }
 
         public bool HasDescription
         {
@@ -28,6 +29,11 @@ namespace Tango.CodeGeneration
             get { return StringFormat != null; }
         }
 
+        public bool HasIndex
+        {
+            get { return Index != null; }
+        }
+
         public DbPropertyExtensionModel()
         {
             StringFormat = "0.0";
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index 780cc2647..76c035df9 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -88,6 +88,12 @@ namespace Tango.BL.Entities
                     [StringFormat("@(prop.PropertyExtension.StringFormat)")]
                 </div>
             }
+            if (prop.PropertyExtension.HasIndex)
+            {
+                <div>
+                    [PropertyIndex(@(prop.PropertyExtension.Index))]
+                </div>
+            }
         }
         public @(prop.Construct || prop.Complex ? "virtual" : "") @(prop.Type) @(prop.Name)
         {
diff --git a/Software/Visual_Studio/Tango.Core/CustomAttributes/PropertyIndexAttribute.cs b/Software/Visual_Studio/Tango.Core/CustomAttributes/PropertyIndexAttribute.cs
new file mode 100644
index 000000000..c9a4fbc9d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/CustomAttributes/PropertyIndexAttribute.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Core.CustomAttributes
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public class PropertyIndexAttribute : Attribute
+    {
+        public int Index { get; set; }
+
+        public PropertyIndexAttribute()
+        {
+            Index = 0;
+        }
+
+        public PropertyIndexAttribute(int index) : this()
+        {
+            Index = index;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/IParameterizedExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/IParameterizedExtensions.cs
index 4850ccc25..c0490af8e 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/IParameterizedExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/IParameterizedExtensions.cs
@@ -54,10 +54,11 @@ public static class IParameterizedExtensions
                 {
                     var paramAtt = prop.GetCustomAttributes(typeof(ParameterItemAttribute), false).Cast<ParameterItemAttribute>().FirstOrDefault();
                     var ignore = prop.GetCustomAttributes(typeof(ParameterIgnoreAttribute), false).Cast<ParameterIgnoreAttribute>().FirstOrDefault();
+                    var indexAttr = prop.GetCustomAttributes(typeof(PropertyIndexAttribute), false).Cast<PropertyIndexAttribute>().FirstOrDefault();
 
                     if (ignore == null && !properties.Exists(x => x.Name == prop.Name))
                     {
-                        var item = instance.CreateParameterItem(prop, paramAtt, index++, mode);
+                        var item = instance.CreateParameterItem(prop, paramAtt,indexAttr != null ? indexAttr.Index : index++, mode);
                         ps.Add(item);
                         properties.Add(prop);
                     }
@@ -65,7 +66,7 @@ public static class IParameterizedExtensions
             }
         }
 
-        return ps;
+        return ps.OrderBy(x => x.Index).ToObservableCollection();
     }
 
     /// <summary>
@@ -119,6 +120,12 @@ public static class IParameterizedExtensions
             {
                 item.StringFormat = formatAtt.Format;
             }
+
+            PropertyIndexAttribute indexAtt = propertyInfo.GetCustomAttribute<PropertyIndexAttribute>();
+            if (indexAtt != null)
+            {
+                item.Index = indexAtt.Index;
+            }
         }
 
         if (mode == ParameterItemMode.Event)
diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index 1dc51c2cf..06c6e5a22 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -89,6 +89,7 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Components\CmdCommand.cs" />
+    <Compile Include="CustomAttributes\PropertyIndexAttribute.cs" />
     <Compile Include="CustomAttributes\StringFormatAttribute.cs" />
     <Compile Include="ExtensionMethods\ByteArrayExtensions.cs" />
     <Compile Include="IO\KnownFolders.cs" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
index f4bda8a29..ca9dae507 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -19,13 +19,18 @@ namespace Tango.DAL.Remote.DB
         public System.DateTime LAST_UPDATED { get; set; }
         public string MACHINE_GUID { get; set; }
         public string JOB_GUID { get; set; }
+        public string USER_GUID { get; set; }
         public string JOB_NAME { get; set; }
         public int JOB_SOURCE { get; set; }
         public string JOB_STRING { get; set; }
         public System.DateTime START_DATE { get; set; }
+        public Nullable<System.DateTime> UPLOADING_START_DATE { get; set; }
+        public Nullable<System.DateTime> HEATING_START_DATE { get; set; }
+        public Nullable<System.DateTime> ACTUAL_START_DATE { get; set; }
         public System.DateTime END_DATE { get; set; }
         public int STATUS { get; set; }
         public double JOB_LENGTH { get; set; }
+        public bool IS_GRADIENT { get; set; }
         public string LIQUID_QUANTITY_STRING { get; set; }
         public double END_POSITION { get; set; }
         public string FAILED_MESSAGE { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs
index 31dcd44d3..773852ba1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs
@@ -39,6 +39,14 @@ namespace Tango.DAL.Remote.DB
         public double HEAD_AIR_FLOW { get; set; }
         public string PROCESS_PARAMETERS_TABLES_GROUP_GUID { get; set; }
         public int TABLE_INDEX { get; set; }
+        public double HEAD_ZONE7_TEMP { get; set; }
+        public double HEAD_ZONE8_TEMP { get; set; }
+        public double HEAD_ZONE9_TEMP { get; set; }
+        public double HEAD_ZONE10_TEMP { get; set; }
+        public double HEAD_ZONE11_TEMP { get; set; }
+        public double HEAD_ZONE12_TEMP { get; set; }
+        public double ST_SP_ZONE1_TEMP { get; set; }
+        public double ST_SP_ZONE2_TEMP { get; set; }
     
         public virtual PROCESS_PARAMETERS_TABLES_GROUPS PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
index 17bc2683d..d26e67908 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
+// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 64b5e2228..f18c157ba 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -603,13 +603,18 @@
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" />
           <Property Name="JOB_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="USER_GUID" Type="varchar" MaxLength="36" />
           <Property Name="JOB_NAME" Type="nvarchar" MaxLength="100" />
           <Property Name="JOB_SOURCE" Type="int" Nullable="false" />
           <Property Name="JOB_STRING" Type="nvarchar(max)" />
           <Property Name="START_DATE" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="UPLOADING_START_DATE" Type="datetime2" Precision="3" />
+          <Property Name="HEATING_START_DATE" Type="datetime2" Precision="3" />
+          <Property Name="ACTUAL_START_DATE" Type="datetime2" Precision="3" />
           <Property Name="END_DATE" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="STATUS" Type="int" Nullable="false" />
           <Property Name="JOB_LENGTH" Type="float" Nullable="false" />
+          <Property Name="IS_GRADIENT" Type="bit" Nullable="false" />
           <Property Name="LIQUID_QUANTITY_STRING" Type="nvarchar(max)" />
           <Property Name="END_POSITION" Type="float" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="nvarchar" MaxLength="300" />
@@ -863,6 +868,14 @@
           <Property Name="HEAD_AIR_FLOW" Type="float" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLES_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="TABLE_INDEX" Type="int" Nullable="false" />
+          <Property Name="HEAD_ZONE7_TEMP" Type="float" Nullable="false" />
+          <Property Name="HEAD_ZONE8_TEMP" Type="float" Nullable="false" />
+          <Property Name="HEAD_ZONE9_TEMP" Type="float" Nullable="false" />
+          <Property Name="HEAD_ZONE10_TEMP" Type="float" Nullable="false" />
+          <Property Name="HEAD_ZONE11_TEMP" Type="float" Nullable="false" />
+          <Property Name="HEAD_ZONE12_TEMP" Type="float" Nullable="false" />
+          <Property Name="ST_SP_ZONE1_TEMP" Type="float" Nullable="false" />
+          <Property Name="ST_SP_ZONE2_TEMP" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS">
           <Key>
@@ -3856,13 +3869,18 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="MACHINE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="JOB_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="USER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="JOB_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="JOB_SOURCE" Type="Int32" Nullable="false" />
           <Property Name="JOB_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="START_DATE" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="UPLOADING_START_DATE" Type="DateTime" Precision="3" />
+          <Property Name="HEATING_START_DATE" Type="DateTime" Precision="3" />
+          <Property Name="ACTUAL_START_DATE" Type="DateTime" Precision="3" />
           <Property Name="END_DATE" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="STATUS" Type="Int32" Nullable="false" />
           <Property Name="JOB_LENGTH" Type="Double" Nullable="false" />
+          <Property Name="IS_GRADIENT" Type="Boolean" Nullable="false" />
           <Property Name="LIQUID_QUANTITY_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="END_POSITION" Type="Double" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="String" MaxLength="300" FixedLength="false" Unicode="true" />
@@ -4158,6 +4176,14 @@
           <Property Name="HEAD_AIR_FLOW" Type="Double" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLES_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="TABLE_INDEX" Type="Int32" Nullable="false" />
+          <Property Name="HEAD_ZONE7_TEMP" Type="Double" Nullable="false" />
+          <Property Name="HEAD_ZONE8_TEMP" Type="Double" Nullable="false" />
+          <Property Name="HEAD_ZONE9_TEMP" Type="Double" Nullable="false" />
+          <Property Name="HEAD_ZONE10_TEMP" Type="Double" Nullable="false" />
+          <Property Name="HEAD_ZONE11_TEMP" Type="Double" Nullable="false" />
+          <Property Name="HEAD_ZONE12_TEMP" Type="Double" Nullable="false" />
+          <Property Name="ST_SP_ZONE1_TEMP" Type="Double" Nullable="false" />
+          <Property Name="ST_SP_ZONE2_TEMP" Type="Double" Nullable="false" />
           <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" />
         </EntityType>
         <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS">
@@ -6292,13 +6318,18 @@
                 <ScalarProperty Name="FAILED_MESSAGE" ColumnName="FAILED_MESSAGE" />
                 <ScalarProperty Name="END_POSITION" ColumnName="END_POSITION" />
                 <ScalarProperty Name="LIQUID_QUANTITY_STRING" ColumnName="LIQUID_QUANTITY_STRING" />
+                <ScalarProperty Name="IS_GRADIENT" ColumnName="IS_GRADIENT" />
                 <ScalarProperty Name="JOB_LENGTH" ColumnName="JOB_LENGTH" />
                 <ScalarProperty Name="STATUS" ColumnName="STATUS" />
                 <ScalarProperty Name="END_DATE" ColumnName="END_DATE" />
+                <ScalarProperty Name="ACTUAL_START_DATE" ColumnName="ACTUAL_START_DATE" />
+                <ScalarProperty Name="HEATING_START_DATE" ColumnName="HEATING_START_DATE" />
+                <ScalarProperty Name="UPLOADING_START_DATE" ColumnName="UPLOADING_START_DATE" />
                 <ScalarProperty Name="START_DATE" ColumnName="START_DATE" />
                 <ScalarProperty Name="JOB_STRING" ColumnName="JOB_STRING" />
                 <ScalarProperty Name="JOB_SOURCE" ColumnName="JOB_SOURCE" />
                 <ScalarProperty Name="JOB_NAME" ColumnName="JOB_NAME" />
+                <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
                 <ScalarProperty Name="JOB_GUID" ColumnName="JOB_GUID" />
                 <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
@@ -6543,6 +6574,14 @@
           <EntitySetMapping Name="PROCESS_PARAMETERS_TABLES">
             <EntityTypeMapping TypeName="RemoteModel.PROCESS_PARAMETERS_TABLES">
               <MappingFragment StoreEntitySet="PROCESS_PARAMETERS_TABLES">
+                <ScalarProperty Name="ST_SP_ZONE2_TEMP" ColumnName="ST_SP_ZONE2_TEMP" />
+                <ScalarProperty Name="ST_SP_ZONE1_TEMP" ColumnName="ST_SP_ZONE1_TEMP" />
+                <ScalarProperty Name="HEAD_ZONE12_TEMP" ColumnName="HEAD_ZONE12_TEMP" />
+                <ScalarProperty Name="HEAD_ZONE11_TEMP" ColumnName="HEAD_ZONE11_TEMP" />
+                <ScalarProperty Name="HEAD_ZONE10_TEMP" ColumnName="HEAD_ZONE10_TEMP" />
+                <ScalarProperty Name="HEAD_ZONE9_TEMP" ColumnName="HEAD_ZONE9_TEMP" />
+                <ScalarProperty Name="HEAD_ZONE8_TEMP" ColumnName="HEAD_ZONE8_TEMP" />
+                <ScalarProperty Name="HEAD_ZONE7_TEMP" ColumnName="HEAD_ZONE7_TEMP" />
                 <ScalarProperty Name="TABLE_INDEX" ColumnName="TABLE_INDEX" />
                 <ScalarProperty Name="PROCESS_PARAMETERS_TABLES_GROUP_GUID" ColumnName="PROCESS_PARAMETERS_TABLES_GROUP_GUID" />
                 <ScalarProperty Name="HEAD_AIR_FLOW" ColumnName="HEAD_AIR_FLOW" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 32b9d05c7..fb41299df 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,84 +5,84 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="13.5" PointY="60.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="11.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="22.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="13.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="26.625" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="12" PointY="52.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="39.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="46.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="46.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="45.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="29.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="11.25" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="11.25" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="9.75" PointY="56.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="12" PointY="55.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="19.5" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="37" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="22.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="41" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="44.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.75" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="15" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="14.75" PointY="46" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="17" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="37.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="52" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="13.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="12" PointY="46.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="14.25" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="3.75" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="13.5" PointY="26" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="22.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="26.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="36.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="30" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="12" PointY="49.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="17.25" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="63.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="65.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="26.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="17.25" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="19.5" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="23.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="16.5" PointY="22.5" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="3.75" PointY="13.25" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="20.75" PointY="23.25" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="19.5" PointY="15.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="20.75" PointY="28.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="21.75" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="21.75" PointY="11.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="21.75" PointY="14.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="22.75" PointY="19.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="22.75" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="18.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="19.5" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="11.25" PointY="37.375" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="39.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="45.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="42.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="11" PointY="41.125" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="18.875" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="26.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="56.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="57.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="55.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="44.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="3.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="11" PointY="2.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="48.125" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="50.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="0.75" PointY="65.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="40.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6" PointY="51.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.75" PointY="63.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="10" PointY="44.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.75" PointY="67.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12" PointY="50.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.75" PointY="67.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9" PointY="55.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="61.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="51.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="51.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.75" PointY="71.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12" PointY="60.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="11" PointY="64" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="13.25" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="5.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="19.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="23.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="37.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="14.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="26.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="30.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="23.375" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="11" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="7.625" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="44.375" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="15.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="23.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="15.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="13.25" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="23.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="7.5" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="7.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.25" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="5.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="14.75" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="16.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="36.375" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="11" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs
index 4685c17fa..8138b2d70 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs
@@ -98,9 +98,6 @@ namespace Tango.PMR.Hardware {
     /// <summary>Field number for the "Voltage" field.</summary>
     public const int VoltageFieldNumber = 3;
     private double voltage_;
-    /// <summary>
-    ///Voltage Description
-    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double Voltage {
       get { return voltage_; }
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs
index 90b502b7f..ff18a73ae 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChdQcm9jZXNzUGFyYW1ldGVycy5wcm90bxISVGFuZ28uUE1SLlByaW50aW5n",
-            "ItgDChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
+            "IpMFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
             "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK",
             "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV",
             "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I",
@@ -33,12 +33,16 @@ namespace Tango.PMR.Printing {
             "CgxEcnllckFpckZsb3cYDiABKAESFgoORHJ5ZXJab25lMVRlbXAYDyABKAES",
             "FgoORHJ5ZXJab25lMlRlbXAYECABKAESFgoORHJ5ZXJab25lM1RlbXAYESAB",
             "KAESGQoRRHJ5ZXJCdWZmZXJMZW5ndGgYEiABKAESEwoLSGVhZEFpckZsb3cY",
-            "EyABKAESEgoKVGFibGVJbmRleBgUIAEoBUIeChxjb20udHdpbmUudGFuZ28u",
-            "cG1yLnByaW50aW5nYgZwcm90bzM="));
+            "EyABKAESEgoKVGFibGVJbmRleBgUIAEoBRIVCg1IZWFkWm9uZTdUZW1wGBUg",
+            "ASgBEhUKDUhlYWRab25lOFRlbXAYFiABKAESFQoNSGVhZFpvbmU5VGVtcBgX",
+            "IAEoARIWCg5IZWFkWm9uZTEwVGVtcBgYIAEoARIWCg5IZWFkWm9uZTExVGVt",
+            "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARIVCg1TdFNwWm9uZTFU",
+            "ZW1wGBsgASgBEhUKDVN0U3Bab25lMlRlbXAYHCABKAFCHgocY29tLnR3aW5l",
+            "LnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "StSpZone1Temp", "StSpZone2Temp" }, null, null, null)
           }));
     }
     #endregion
@@ -89,6 +93,14 @@ namespace Tango.PMR.Printing {
       dryerBufferLength_ = other.dryerBufferLength_;
       headAirFlow_ = other.headAirFlow_;
       tableIndex_ = other.tableIndex_;
+      headZone7Temp_ = other.headZone7Temp_;
+      headZone8Temp_ = other.headZone8Temp_;
+      headZone9Temp_ = other.headZone9Temp_;
+      headZone10Temp_ = other.headZone10Temp_;
+      headZone11Temp_ = other.headZone11Temp_;
+      headZone12Temp_ = other.headZone12Temp_;
+      stSpZone1Temp_ = other.stSpZone1Temp_;
+      stSpZone2Temp_ = other.stSpZone2Temp_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -316,6 +328,94 @@ namespace Tango.PMR.Printing {
       }
     }
 
+    /// <summary>Field number for the "HeadZone7Temp" field.</summary>
+    public const int HeadZone7TempFieldNumber = 21;
+    private double headZone7Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double HeadZone7Temp {
+      get { return headZone7Temp_; }
+      set {
+        headZone7Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "HeadZone8Temp" field.</summary>
+    public const int HeadZone8TempFieldNumber = 22;
+    private double headZone8Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double HeadZone8Temp {
+      get { return headZone8Temp_; }
+      set {
+        headZone8Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "HeadZone9Temp" field.</summary>
+    public const int HeadZone9TempFieldNumber = 23;
+    private double headZone9Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double HeadZone9Temp {
+      get { return headZone9Temp_; }
+      set {
+        headZone9Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "HeadZone10Temp" field.</summary>
+    public const int HeadZone10TempFieldNumber = 24;
+    private double headZone10Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double HeadZone10Temp {
+      get { return headZone10Temp_; }
+      set {
+        headZone10Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "HeadZone11Temp" field.</summary>
+    public const int HeadZone11TempFieldNumber = 25;
+    private double headZone11Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double HeadZone11Temp {
+      get { return headZone11Temp_; }
+      set {
+        headZone11Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "HeadZone12Temp" field.</summary>
+    public const int HeadZone12TempFieldNumber = 26;
+    private double headZone12Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double HeadZone12Temp {
+      get { return headZone12Temp_; }
+      set {
+        headZone12Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "StSpZone1Temp" field.</summary>
+    public const int StSpZone1TempFieldNumber = 27;
+    private double stSpZone1Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double StSpZone1Temp {
+      get { return stSpZone1Temp_; }
+      set {
+        stSpZone1Temp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "StSpZone2Temp" field.</summary>
+    public const int StSpZone2TempFieldNumber = 28;
+    private double stSpZone2Temp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double StSpZone2Temp {
+      get { return stSpZone2Temp_; }
+      set {
+        stSpZone2Temp_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ProcessParameters);
@@ -349,6 +449,14 @@ namespace Tango.PMR.Printing {
       if (DryerBufferLength != other.DryerBufferLength) return false;
       if (HeadAirFlow != other.HeadAirFlow) return false;
       if (TableIndex != other.TableIndex) return false;
+      if (HeadZone7Temp != other.HeadZone7Temp) return false;
+      if (HeadZone8Temp != other.HeadZone8Temp) return false;
+      if (HeadZone9Temp != other.HeadZone9Temp) return false;
+      if (HeadZone10Temp != other.HeadZone10Temp) return false;
+      if (HeadZone11Temp != other.HeadZone11Temp) return false;
+      if (HeadZone12Temp != other.HeadZone12Temp) return false;
+      if (StSpZone1Temp != other.StSpZone1Temp) return false;
+      if (StSpZone2Temp != other.StSpZone2Temp) return false;
       return true;
     }
 
@@ -375,6 +483,14 @@ namespace Tango.PMR.Printing {
       if (DryerBufferLength != 0D) hash ^= DryerBufferLength.GetHashCode();
       if (HeadAirFlow != 0D) hash ^= HeadAirFlow.GetHashCode();
       if (TableIndex != 0) hash ^= TableIndex.GetHashCode();
+      if (HeadZone7Temp != 0D) hash ^= HeadZone7Temp.GetHashCode();
+      if (HeadZone8Temp != 0D) hash ^= HeadZone8Temp.GetHashCode();
+      if (HeadZone9Temp != 0D) hash ^= HeadZone9Temp.GetHashCode();
+      if (HeadZone10Temp != 0D) hash ^= HeadZone10Temp.GetHashCode();
+      if (HeadZone11Temp != 0D) hash ^= HeadZone11Temp.GetHashCode();
+      if (HeadZone12Temp != 0D) hash ^= HeadZone12Temp.GetHashCode();
+      if (StSpZone1Temp != 0D) hash ^= StSpZone1Temp.GetHashCode();
+      if (StSpZone2Temp != 0D) hash ^= StSpZone2Temp.GetHashCode();
       return hash;
     }
 
@@ -465,6 +581,38 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(160, 1);
         output.WriteInt32(TableIndex);
       }
+      if (HeadZone7Temp != 0D) {
+        output.WriteRawTag(169, 1);
+        output.WriteDouble(HeadZone7Temp);
+      }
+      if (HeadZone8Temp != 0D) {
+        output.WriteRawTag(177, 1);
+        output.WriteDouble(HeadZone8Temp);
+      }
+      if (HeadZone9Temp != 0D) {
+        output.WriteRawTag(185, 1);
+        output.WriteDouble(HeadZone9Temp);
+      }
+      if (HeadZone10Temp != 0D) {
+        output.WriteRawTag(193, 1);
+        output.WriteDouble(HeadZone10Temp);
+      }
+      if (HeadZone11Temp != 0D) {
+        output.WriteRawTag(201, 1);
+        output.WriteDouble(HeadZone11Temp);
+      }
+      if (HeadZone12Temp != 0D) {
+        output.WriteRawTag(209, 1);
+        output.WriteDouble(HeadZone12Temp);
+      }
+      if (StSpZone1Temp != 0D) {
+        output.WriteRawTag(217, 1);
+        output.WriteDouble(StSpZone1Temp);
+      }
+      if (StSpZone2Temp != 0D) {
+        output.WriteRawTag(225, 1);
+        output.WriteDouble(StSpZone2Temp);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -530,6 +678,30 @@ namespace Tango.PMR.Printing {
       if (TableIndex != 0) {
         size += 2 + pb::CodedOutputStream.ComputeInt32Size(TableIndex);
       }
+      if (HeadZone7Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (HeadZone8Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (HeadZone9Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (HeadZone10Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (HeadZone11Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (HeadZone12Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (StSpZone1Temp != 0D) {
+        size += 2 + 8;
+      }
+      if (StSpZone2Temp != 0D) {
+        size += 2 + 8;
+      }
       return size;
     }
 
@@ -598,6 +770,30 @@ namespace Tango.PMR.Printing {
       if (other.TableIndex != 0) {
         TableIndex = other.TableIndex;
       }
+      if (other.HeadZone7Temp != 0D) {
+        HeadZone7Temp = other.HeadZone7Temp;
+      }
+      if (other.HeadZone8Temp != 0D) {
+        HeadZone8Temp = other.HeadZone8Temp;
+      }
+      if (other.HeadZone9Temp != 0D) {
+        HeadZone9Temp = other.HeadZone9Temp;
+      }
+      if (other.HeadZone10Temp != 0D) {
+        HeadZone10Temp = other.HeadZone10Temp;
+      }
+      if (other.HeadZone11Temp != 0D) {
+        HeadZone11Temp = other.HeadZone11Temp;
+      }
+      if (other.HeadZone12Temp != 0D) {
+        HeadZone12Temp = other.HeadZone12Temp;
+      }
+      if (other.StSpZone1Temp != 0D) {
+        StSpZone1Temp = other.StSpZone1Temp;
+      }
+      if (other.StSpZone2Temp != 0D) {
+        StSpZone2Temp = other.StSpZone2Temp;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -688,6 +884,38 @@ namespace Tango.PMR.Printing {
             TableIndex = input.ReadInt32();
             break;
           }
+          case 169: {
+            HeadZone7Temp = input.ReadDouble();
+            break;
+          }
+          case 177: {
+            HeadZone8Temp = input.ReadDouble();
+            break;
+          }
+          case 185: {
+            HeadZone9Temp = input.ReadDouble();
+            break;
+          }
+          case 193: {
+            HeadZone10Temp = input.ReadDouble();
+            break;
+          }
+          case 201: {
+            HeadZone11Temp = input.ReadDouble();
+            break;
+          }
+          case 209: {
+            HeadZone12Temp = input.ReadDouble();
+            break;
+          }
+          case 217: {
+            StSpZone1Temp = input.ReadDouble();
+            break;
+          }
+          case 225: {
+            StSpZone2Temp = input.ReadDouble();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
index 1b33e13d2..c4c16b416 100644
--- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
@@ -756,11 +756,7 @@ namespace Tango.PMRGenerator.CLI
                 }
                 catch { }
 
-                if (rangeDescription != null && rangeDescription.Description != null)
-                {
-                    return rangeDescription.Description.ToLines().Take(1).Concat(rangeDescription.Description.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine);
-                }
-                else
+                if (rangeDescription == null)
                 {
                     return db_des.ColumnDescription.ToLines().Take(1).Concat(db_des.ColumnDescription.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine);
                 }
-- 
cgit v1.3.1