From efde98a69746f41c1055858142b1935955d82fb0 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 24 Feb 2020 16:51:04 +0200
Subject: Implemented job runs reset on factory restore.

---
 .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 7e47097ca..275db58c9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.1.0.0")]
+[assembly: AssemblyVersion("4.1.1.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
-- 
cgit v1.3.1


From 09686240419bf92d2963564fb4a56f6e566468ce Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 24 Feb 2020 18:53:10 +0200
Subject: Added RmlQualification and HeadType enums to machine and RML.
 Filtered RML by head type on PPC. Updated SQLExaminer configurations.. Added
 all new rml and machine parameters to machine designer and RML modules.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../Views/JobView.xaml                             |   8 ++---
 .../Views/MachineSettingsView.xaml                 |   9 +++++
 .../ViewModels/MainViewVM.cs                       |  11 ++++++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  11 ++++++
 .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs |   4 +--
 .../Tango.PPC.Jobs/ViewModels/JobsViewVM.cs        |   2 +-
 .../ViewModels/MainViewVM.cs                       |   2 +-
 .../PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs      |   6 ++--
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 .../Tango.BL/Builders/RmlsCollectionBuilder.cs     |  11 +++++-
 .../Visual_Studio/Tango.BL/Entities/Machine.cs     |  17 +++++++++
 .../Tango.BL/Entities/ProcessParametersTable.cs    |   8 +++++
 Software/Visual_Studio/Tango.BL/Entities/Rml.cs    |  39 +++++++++++++++++++++
 .../Tango.BL/Enumerations/HeadTypes.cs             |  14 ++++++++
 .../Tango.BL/Enumerations/RmlQualifications.cs     |  15 ++++++++
 Software/Visual_Studio/Tango.BL/Tango.BL.csproj    |   4 ++-
 .../SQLExaminer/Configurations/OverrideData.xml    | Bin 80438 -> 81980 bytes
 .../Configurations/ProvisionMachine.xml            | Bin 87446 -> 87736 bytes
 .../SQLExaminer/Configurations/UpdateMachine.xml   | Bin 54712 -> 55002 bytes
 23 files changed, 149 insertions(+), 14 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs
 create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index bdc7134c7..1da670886 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 3d480cd4e..13aed7905 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 07f4446e6..d3f041c38 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 e7664226d..a716c1359 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
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 bf8eddd91..70422a8ca 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
@@ -680,7 +680,7 @@
                                         </StackPanel>
                                     </Border>
 
-                                    <Border Style="{StaticResource JobFieldBorder}">
+                                    <Border Style="{StaticResource JobFieldBorder}" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                         <StackPanel Margin="20 5 5 5"  Width="140">
                                             <StackPanel Orientation="Horizontal">
                                                 <Image Source="../Images/repeat.png" Width="32"></Image>
@@ -792,7 +792,7 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
                                                             <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" />
@@ -898,7 +898,7 @@
                                                             </DockPanel>
                                                         </Grid>
                                                         <Grid Margin="0 10 10 0">
-                                                            <controls:MultiSelectListBox x:Name="listStops" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                                                            <controls:MultiSelectListBox x:Name="listStops" ScrollViewer.HorizontalScrollBarVisibility="Disabled" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
                                                                 <ListBox.Template>
                                                                     <ControlTemplate TargetType="{x:Type ListBox}">
                                                                         <Border x:Name="Bd" SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
@@ -1404,7 +1404,7 @@
                 <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
-                            <Setter Property="Width" Value="640"></Setter>
+                            <Setter Property="Width" Value="740"></Setter>
                             <Setter Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 499d6dc89..954ac5f0e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
@@ -13,6 +14,11 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter"/>
+    </UserControl.Resources>
+    
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Bottom">
@@ -44,6 +50,9 @@
                                     <TextBlock FontWeight="SemiBold">Name</TextBlock>
                                     <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
+                                    <TextBlock FontWeight="SemiBold">Head Type</TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveMachine.MachineHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+
                                     <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
                                     <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 5c55892ba..3b3a307ad 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -24,6 +24,7 @@ using Tango.Core.ExtensionMethods;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.BL.ActionLogs;
 using Tango.BL.DTO;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.RML.ViewModels
 {
@@ -410,6 +411,8 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                     Rml rml = new Rml();
                     rml.Name = name;
+                    rml.DisplayName = name;
+                    rml.QualificationDate = DateTime.UtcNow;
                     rml.Manufacturer = "Twine";
                     rml.Code = Rmls.Max(x => x.Code) + 1;
                     rml.MediaMaterial = Materials.FirstOrDefault();
@@ -501,6 +504,9 @@ namespace Tango.MachineStudio.RML.ViewModels
                             cloned.Guid = Guid.NewGuid().ToString();
                             cloned.ID = 0;
                             cloned.Name = name;
+                            cloned.DisplayName = name;
+                            cloned.RmlQualificationLevel = RmlQualifications.Provisional;
+                            cloned.QualificationDate = DateTime.UtcNow;
 
                             ProcessParametersTablesGroup group = new ProcessParametersTablesGroup();
                             group.Name = rml.GetActiveProcessGroup().Name;
@@ -674,6 +680,11 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                     ActiveRML.LastUpdated = DateTime.UtcNow;
 
+                    if (_rmlBeforeSave.QualificationLevel != ActiveRML.QualificationLevel)
+                    {
+                        ActiveRML.QualificationDate = DateTime.UtcNow;
+                    }
+
                     if (SelectedCCT != null)
                     {
                         if (SelectedCCT.IsNew)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index e34854046..2c8d538d0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:global="clr-namespace:Tango.MachineStudio.RML"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
@@ -19,6 +20,7 @@
 
     <UserControl.Resources>
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter"/>
     </UserControl.Resources>
 
     <Grid Margin="20">
@@ -58,6 +60,15 @@
                                     <TextBlock Text="Name:" ></TextBlock>
                                     <TextBox Text="{Binding ActiveRML.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
+                                    <TextBlock Text="Display Name:" ></TextBlock>
+                                    <TextBox Text="{Binding ActiveRML.DisplayName,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+
+                                    <TextBlock Text="Head Type:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.RmlHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+
+                                    <TextBlock Text="Qualification Level:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:RmlQualifications},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.RmlQualificationLevel}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+
                                     <TextBlock Text="Manufacturer:" ></TextBlock>
                                     <TextBox Text="{Binding ActiveRML.Manufacturer}"></TextBox>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index c394bbfa1..18ca6bd1f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -468,7 +468,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     Job.ValidateOnPropertyChanged = true;
 
                     LogManager.Log("Loading RMLS...");
-                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).ToList();
+                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).ToList();
                     LogManager.Log("Loading Color Spaces...");
                     ColorSpaces = await _db.ColorSpaces.ToListAsync();
                     LogManager.Log("Loading Spool Types...");
@@ -760,7 +760,7 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 draggedSegment.SegmentIndex = droppedSegment.SegmentIndex + 1;
             }
-            
+
             ArrangeSegmentsIndices();
         }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index 0d7f399df..af576ac93 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -741,7 +741,7 @@ namespace Tango.PPC.Jobs.ViewModels
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
                 _catalogs = await new CatalogsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
-                _rmls = await new RmlsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
+                _rmls = await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
             }
 
             MachineDataSynchronizer.SynchronizationEnded += MachineDataSynchronizer_SynchronizationEnded;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 8b48c51aa..4df43ee55 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -235,7 +235,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                Rmls = await new RmlsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
+                Rmls = await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
             }
         }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index 048234949..b53a54682 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -127,7 +127,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    rmls = await new RmlsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildListAsync();
+                    rmls = await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildListAsync();
                 }
 
                 var selectedRml = rmls.SingleOrDefault(x => x.Guid == Settings.LoadedRmlGuid);
@@ -167,7 +167,7 @@ namespace Tango.PPC.UI.ViewModels
                             else
                             {
                                 LogManager.Log("Selected minimal temperature...");
-                                var rmlsToAvg = new RmlsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().Build();
+                                var rmlsToAvg = new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().Build();
                                 processTables = rmlsToAvg.Select(x => x.GetActiveProcessGroup()).SelectMany(x => x.ProcessParametersTables).ToList();
                             }
 
@@ -227,7 +227,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    rmls = await new RmlsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().BuildListAsync();
+                    rmls = await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().BuildListAsync();
                 }
 
                 var selectedRml = rmls.SingleOrDefault(x => x.Guid == Settings.LoadedRmlGuid);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
index b23eb9507..8a5b4b00c 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
 using System.Data.Entity;
+using Tango.BL.Enumerations;
 
 namespace Tango.BL.Builders
 {
@@ -38,9 +39,17 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual RmlsCollectionBuilder WithCCT()
+        public virtual RmlsCollectionBuilder ForHeadType(HeadTypes headType)
         {
             return AddQueryStep(2, (query) =>
+            {
+                return query.Where(x => x.HeadType == (int)headType);
+            });
+        }
+
+        public virtual RmlsCollectionBuilder WithCCT()
+        {
+            return AddQueryStep(3, (query) =>
             {
                 return query.Include(x => x.Cct);
             });
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
index a7ba29c2a..2070c68b3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
@@ -73,6 +73,23 @@ namespace Tango.BL.Entities
             }
         }
 
+        /// <summary>
+        /// Gets or sets the installed head on this machine.
+        /// </summary>
+        [NotMapped]
+        [JsonIgnore]
+        public HeadTypes MachineHeadType
+        {
+            get
+            {
+                return (HeadTypes)HeadType;
+            }
+            set
+            {
+                HeadType = value.ToInt32();
+            }
+        }
+
         #endregion
 
         protected override void RaisePropertyChanged(string propName)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
index 729d01951..f8d39862d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
@@ -56,6 +56,14 @@ namespace Tango.BL.Entities
             heaters.Add(HeadZone4Temp);
             heaters.Add(HeadZone5Temp);
             heaters.Add(HeadZone6Temp);
+            heaters.Add(HeadZone7Temp);
+            heaters.Add(HeadZone8Temp);
+            heaters.Add(HeadZone9Temp);
+            heaters.Add(HeadZone10Temp);
+            heaters.Add(HeadZone11Temp);
+            heaters.Add(HeadZone12Temp);
+            heaters.Add(StSpZone1Temp);
+            heaters.Add(StSpZone2Temp);
 
             return heaters.Average();
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index b9224a6d6..ddaacfbd0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -1,11 +1,14 @@
 using ColorMine.ColorSpaces;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using Tango.BL.Builders;
+using Tango.BL.Enumerations;
 using Tango.BL.Serialization;
 
 namespace Tango.BL.Entities
@@ -45,6 +48,8 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Color));
         }
 
+        [NotMapped]
+        [JsonIgnore]
         public Color Color
         {
             get
@@ -55,6 +60,40 @@ namespace Tango.BL.Entities
             }
         }
 
+        /// <summary>
+        /// Gets or sets the thread head type.
+        /// </summary>
+        [NotMapped]
+        [JsonIgnore]
+        public HeadTypes RmlHeadType
+        {
+            get
+            {
+                return (HeadTypes)HeadType;
+            }
+            set
+            {
+                HeadType = value.ToInt32();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the thread qualification level.
+        /// </summary>
+        [NotMapped]
+        [JsonIgnore]
+        public RmlQualifications RmlQualificationLevel
+        {
+            get
+            {
+                return (RmlQualifications)QualificationLevel;
+            }
+            set
+            {
+                QualificationLevel = value.ToInt32();
+            }
+        }
+
         public ProcessParametersTablesGroup GetActiveProcessGroup()
         {
             return ProcessParametersTablesGroups.FirstOrDefault(x => x.Active);
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs
new file mode 100644
index 000000000..c110958f8
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Enumerations
+{
+    public enum HeadTypes
+    {
+        Flat = 0,
+        Arc = 1,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs b/Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs
new file mode 100644
index 000000000..8864bc0b0
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Enumerations
+{
+    public enum RmlQualifications
+    {
+        Provisional = 0,
+        Supported = 1,
+        Certified = 2,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 4a9912c34..2a5090c2e 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -392,8 +392,10 @@
     <Compile Include="Enumerations\ActionLogType.cs" />
     <Compile Include="Enumerations\CatalogDesignType.cs" />
     <Compile Include="Enumerations\ColorCatalogsItems.cs" />
+    <Compile Include="Enumerations\HeadTypes.cs" />
     <Compile Include="Enumerations\JobSource.cs" />
     <Compile Include="Enumerations\TangoUpdateStatuses.cs" />
+    <Compile Include="Enumerations\RmlQualifications.cs" />
     <Compile Include="IObservableEntityDTO.cs" />
     <Compile Include="ObservableDTOPropertyAttribute.cs" />
     <Compile Include="ObservableEntityDTO.cs" />
@@ -608,7 +610,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index 52d363fe3..c0d3aa837 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml differ
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
index a2221c619..d33b19137 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml differ
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
index 8812256d5..d24d74337 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml differ
-- 
cgit v1.3.1