Added Data grid displaying all available recorded files for download.

Related Work Items: #5820

21 files changed, 822 insertions, 145 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj
index 065dec29e..ae05ca02c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj
@@ -53,6 +53,15 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.ShellExtensions, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs
index 41be789ed..68a886f99 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs
@@ -1,8 +1,11 @@
 using Microsoft.Win32;
+using Microsoft.WindowsAPICodePack.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Data.Entity;
+using System.Diagnostics;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL;
@@ -10,6 +13,7 @@ using Tango.BL.ActionLogs;
 using Tango.BL.DTO;
 using Tango.BL.Entities;
 using Tango.BL.Enumerations;
+using Tango.BL.ValueObjects;
 using Tango.Core.Commands;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.ThreadExtensions.Models;
@@ -21,9 +25,9 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
     {
         private INotificationProvider _notification;
         private IActionLogManager _actionLogManager;
-        
+
         #region Properties
-        
+
         private string _threadName;
         /// <summary>
         /// Gets or sets the name of the thread. Using in print
@@ -51,7 +55,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             get { return _isSelected; }
             set { _isSelected = value; RaisePropertyChangedAuto(); }
         }
-        
+
         private RmlExtensionTestResult _testResult;
 
         public RmlExtensionTestResult TestResult
@@ -59,19 +63,124 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             get { return _testResult; }
             set { _testResult = value;
                 RaisePropertyChangedAuto();
+                RaisePropertyChanged(nameof(TestResultsFiles));
             }
         }
 
-
-        #endregion
+        public List<RmlExtensionTestResultsFile> TestResultsFiles
+        {
+            get
+            {
+                return TestResult.RmlExtensionTestResultsFiles.ToList();
+            }
+        }
         
+        public RelayCommand<RmlExtensionTestResultsFile> DeleteCommand { get; set; }
+        public RelayCommand<RmlExtensionTestResultsFile> DownLoadFileCommand { get; set; }
+        public RelayCommand UploadCommand { get; set; }
+        public RelayCommand DownLoadAllCommand { get; set; }
+        #endregion
+
 
         public TestResultViewVM(INotificationProvider notification, IActionLogManager actionLogManager)
         {
             _notification = notification;
             _actionLogManager = actionLogManager;
+            
+            UploadCommand = new RelayCommand(UploadFiles);
+            DownLoadFileCommand = new RelayCommand<RmlExtensionTestResultsFile>(DownLoadFile);
+            DeleteCommand = new RelayCommand<RmlExtensionTestResultsFile>(DeleteFile);
+            DownLoadAllCommand = new RelayCommand(DownLoadAllFiles);
         }
+
+        #region TestResultsFiles
         
+        private async void UploadFiles(object obj)
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Title = "Select data file";
+            dlg.Filter = "CSV Files|*.csv";
+            dlg.Multiselect = true;
+            if (dlg.ShowDialog().Value)
+            {
+                try
+                {
+                    var files = dlg.FileNames.ToList();
+
+                    using (ObservablesContext db = ObservablesContext.CreateDefault())
+                    {
+                        var testResult = await db.RmlExtensionTestResults.Where(x => x.Guid == TestResult.Guid).Include(t1 => t1.RmlExtensionTestResultsFiles).FirstOrDefaultAsync();
+                        foreach (var strpath in files)
+                        {
+                            var testResultfile = new RmlExtensionTestResultsFile();
+                            testResultfile.FileName = Path.GetFileName(strpath);
+                            //temporary!!!
+                            testResultfile.FilePath = strpath;
+                            
+                           // TestResult.RmlExtensionTestResultsFiles.Add(testResultfile);
+                            testResult.RmlExtensionTestResultsFiles.Add(testResultfile);
+                        }
+                        if (testResult != null)
+                        {
+                            await db.SaveChangesAsync();
+                        }
+                        TestResult.RmlExtensionTestResultsFiles = testResult.RmlExtensionTestResultsFiles;///?????
+                        RaisePropertyChanged(nameof(TestResultsFiles));
+                    }
+                    _notification.ShowInfo("File successfully loaded.");
+                }
+                catch (Exception ex)
+                {
+                    _notification.ShowError($"An error occurred while trying to import the file.\n{ex.FlattenMessage()}");
+                }
+            }
+           
+        }
+        
+        private void DownLoadFile(RmlExtensionTestResultsFile file)
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Title = "Save the csv file";
+            dlg.Filter = "CSV Files|*.csv";
+            dlg.DefaultExt = ".csv";
+            dlg.FileName = file.FileName;
+            if (dlg.ShowDialog().Value)
+            {
+                ///
+            }
+        }
+
+        private void DownLoadAllFiles()
+        {
+            CommonOpenFileDialog dlg = new CommonOpenFileDialog();
+            dlg.Title = "Select folder.";
+            dlg.IsFolderPicker = true;
+            if (dlg.ShowDialog() == CommonFileDialogResult.Ok)
+            {
+                var filesPath = TestResult.RmlExtensionTestResultsFiles.Select( x=>x.FilePath).ToList();
+                /////
+            }
+        }
+
+        private async void DeleteFile(RmlExtensionTestResultsFile file)
+        {
+            if (_notification.ShowQuestion("Are you sure you want to delete the selected file?"))
+            {
+                using (ObservablesContext db = ObservablesContext.CreateDefault())
+                {
+                    var deletefile = db.RmlExtensionTestResultsFiles.FirstOrDefault(x => x.Guid == file.Guid);
+                    if(deletefile != null)
+                    {
+                        db.RmlExtensionTestResultsFiles.Remove(deletefile);
+                        await db.SaveChangesAsync();
+                    }
+                }
+                TestResult.RmlExtensionTestResultsFiles.Remove(file);
+                RaisePropertyChanged(nameof(TestResultsFiles));
+            }
+        }
         
+        #endregion
+
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
index c1fb4497f..f639eb6e7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
@@ -1,6 +1,8 @@
-using System;
+using Microsoft.Win32;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -271,7 +273,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
                 using (_notification.PushTaskItem("Loading Test Results Parameters ..."))
                 {
-                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().BuildAsync();
+                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().BuildAsync();
                     SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection();
                     foreach (var result in SelectedTestResults)
                     {
@@ -403,6 +405,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
         #endregion
 
+        #region  Excel
+
         public async void LoadTestResultsExcel(List<TestResultsExcelModel> testResultsExcelModelList, string machineGUID, string machineSerialNumber)
         {
             try
@@ -556,5 +560,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                 IsFree = true;
             }
         }
+
+        #endregion
+        
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
index b8a4b7f28..f6262b52d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
@@ -158,33 +158,12 @@
 
     </UserControl.Resources>
     <Grid  DataContext="{Binding  TestResultsViewVM}">
-        <Grid.RowDefinitions>
+        <!--<Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
-        <DockPanel Grid.Row="0">
-            <Button DockPanel.Dock="Top" HorizontalAlignment="Right" Width="170" Height="36" Margin="0 0 26 0" VerticalAlignment="Center" Command="{Binding SaveCommand}">
-                <StackPanel Orientation="Horizontal">
-                    <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
-                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
-                </StackPanel>
-            </Button>
-            <!--<StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-                <TextBlock Margin="40 20" FontSize="30" FontWeight="SemiBold" FontStyle="Italic">TARGET MACHINE</TextBlock>
-
-                <autoComplete:AutoCompleteTextBox Provider="{StaticResource MachinesProvider}" LoadingContent="Loading..."  FontSize="20" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number" DisplayMember="SerialNumber" Width="280">
-                    <autoComplete:AutoCompleteTextBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel>
-                                <TextBlock Text="{Binding SerialNumber}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                                <TextBlock FontSize="11" Text="{Binding Name}" Foreground="Gray"></TextBlock>
-                            </StackPanel>
-                        </DataTemplate>
-                    </autoComplete:AutoCompleteTextBox.ItemTemplate>
-                </autoComplete:AutoCompleteTextBox>
-            </StackPanel>-->
-        </DockPanel>
-        <Grid Grid.Row="1" >
+        </Grid.RowDefinitions>-->
+       
+        <Grid Grid.Row="1" Margin="0 8 0 0" >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"/>
                 <RowDefinition Height="1*"/>
@@ -266,17 +245,16 @@
 
                 <Grid Grid.Column="0" MinWidth="600" HorizontalAlignment="Left" >
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="3*"/>
                         <RowDefinition Height="1*"/>
-                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="1*"/>
                     </Grid.ColumnDefinitions>
-                    
-                    <Border Padding="10 10 20 10" Grid.ColumnSpan="2" BorderBrush="Transparent"  BorderThickness="1" >
-                            
-                            <ScrollViewer VerticalScrollBarVisibility="Auto"  >
+
+                    <Border Padding="10 10 20 10" Grid.ColumnSpan="2" Grid.Row="0" BorderBrush="Transparent"  BorderThickness="1" >
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"  >
                                 <Grid HorizontalAlignment="Left">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="1*"></ColumnDefinition>
@@ -289,8 +267,8 @@
                                     </Grid.RowDefinitions>
                                     <Border>
                                     <StackPanel x:Name="DryerTempPanel"  HorizontalAlignment="Stretch" Grid.Column="0" Grid.Row="0" >
-                                            <DockPanel Margin="0 0 0 0">
-                                                <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left"  Padding="0" Height="Auto" Width="200"  Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters" VerticalContentAlignment="Center">
+                                            <DockPanel Margin="0 10 0 0">
+                                                <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left"  Padding="0"  Width="200"  Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters" VerticalContentAlignment="Center">
                                                     <TextBlock FontSize="14" Background="Transparent"  VerticalAlignment="Center" Margin="0 2 0 0">Apply to Process Parameters</TextBlock>
                                                 </Button>
                                                 <TextBlock HorizontalAlignment="Center"  FontSize="21" Margin="180 10 0 0"> Process Parameters</TextBlock>
@@ -386,7 +364,7 @@
                                         </DataGrid>
 
                                     </StackPanel>
-                                    <StackPanel x:Name="TensionresultsPanel" Grid.Column="1" Grid.Row="0" Margin="0 10 0 0" >
+                                    <StackPanel x:Name="TensionresultsPanel" Grid.Column="1" Grid.Row="0" Margin="0 20 0 0" >
                                         <TextBlock HorizontalAlignment="Center" FontSize="21"> Tension through the thread path</TextBlock>
                                         <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 10 20 10" >
                                             <UniformGrid Columns="4"  Background="{StaticResource TransparentBackgroundBrush}"  HorizontalAlignment="Left" MinWidth="{ Binding ElementName=MechanicalPropertiesGrid, Path= ActualWidth }" >
@@ -627,7 +605,7 @@
                         </ScrollViewer>
                         </Border>
                         
-                    <Grid Grid.Row="1" Grid.Column="1" Margin="0 0 20 40">
+                    <Grid Grid.Row="1" Grid.Column="1" Margin="0 0 20 20">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="120"/>
                             <ColumnDefinition Width="1*"/>
@@ -637,16 +615,83 @@
                             <RowDefinition Height="1*" />
                         </Grid.RowDefinitions>
 
-                        <TextBlock FontSize="21" HorizontalAlignment="Left"  Margin="0 10 0 0">Conclusion:</TextBlock>
+                        <TextBlock FontSize="21" HorizontalAlignment="Left"  VerticalAlignment="Center">Conclusion:</TextBlock>
                         <TextBox Grid.Column="1" Margin="20 0 20 0" HorizontalAlignment="Stretch" Height="46" Text="{Binding SelectedTab.TestResult.Conclusions}" Style="{StaticResource Rounded_Corners_TextBox_Multiline}"></TextBox>
 
-                        <TextBlock Grid.Row="1" FontSize="21" Margin="0 30 0 0" HorizontalAlignment="Left">Comments:</TextBlock>
-                        <TextBox Grid.Column="1" Grid.Row="1" Margin="20 20 20 0"  Style="{StaticResource Rounded_Corners_TextBox_Multiline}"   HorizontalAlignment="Stretch" Height="46" Text="{Binding SelectedTab.TestResult.Comment}"></TextBox>
+                        <TextBlock Grid.Row="1" FontSize="21" HorizontalAlignment="Left" VerticalAlignment="Center">Comments:</TextBlock>
+                        <TextBox Grid.Column="1" Grid.Row="1" Margin="20 0 20 0"  Style="{StaticResource Rounded_Corners_TextBox_Multiline}"   HorizontalAlignment="Stretch" Height="46" Text="{Binding SelectedTab.TestResult.Comment}" VerticalAlignment="Center"></TextBox>
                             
                     </Grid>
+                    <DockPanel  Grid.Row="1" Grid.Column="0" Margin="20 0 20 20" x:Name="ImportExcelFile">
+                        <DockPanel DockPanel.Dock="Top" Margin="0 0 20 0">
+                            <Button  Margin="10 0 0 0"  Padding="2" Height="24" Cursor="Hand" Width="100" Command="{Binding SelectedTab.UploadCommand}" ToolTip="Upload selected files">Upload</Button>
+                            <Button DockPanel.Dock="Right" Margin="0 0 10 0" HorizontalAlignment="Right" Padding="2" Height="24" Cursor="Hand" Width="100" Command="{Binding SelectedTab.DownLoadAllCommand}" ToolTip="Upload selected files">Download All</Button>
+                        </DockPanel>
+                        
+                        <Grid  DockPanel.Dock="Bottom" Margin="0 0 20 0">
+                            <DataGrid  Margin="10" RowHeight="30" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}"  AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResultsFiles}" IsReadOnly="True" 
+                                  ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" MinHeight="100">
+                                <DataGrid.ColumnHeaderStyle >
+                                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+                                        <Setter Property="FontSize" Value="16"/>
+                                        <Setter Property="HorizontalAlignment" Value="Left"/>
+                                        <Setter Property="Margin" Value="2 0 0 0"/>
+                                        <Setter Property="Padding" Value="0 5"/>
+                                        <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                    </Style>
+                                </DataGrid.ColumnHeaderStyle>
+                                <DataGrid.CellStyle>
+                                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                        <Setter Property="BorderThickness" Value="0"/>
+                                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                                        <Setter Property="Padding" Value="0"></Setter>
+                                        <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                                    </Style>
+                                </DataGrid.CellStyle>
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="File Name" Binding="{Binding FileName}" Width="1*" FontSize="16"/>
+                                    <DataGridTextColumn Header="Progress"  Width="1*" />
+                                    <DataGridTemplateColumn Header="DownLoad" Width="140">
+                                        <DataGridTemplateColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <Button Style="{StaticResource emptyButton}" Cursor="Hand"  Command="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid},AncestorLevel=2},Path=DataContext.SelectedTab.DownLoadFileCommand}" CommandParameter="{Binding}">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <TextBlock FontSize="16" Text="Download" VerticalAlignment="Center"></TextBlock>
+                                                        <materialDesign:PackIcon VerticalAlignment="Center" Margin="5 0 0 0" Kind="Download" Width="18" />
+                                                    </StackPanel>
+                                                </Button>
+                                            </DataTemplate>
+                                        </DataGridTemplateColumn.CellTemplate>
+                                    </DataGridTemplateColumn>
+                                    <DataGridTemplateColumn Header="Delete" Width="140">
+                                        <DataGridTemplateColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <Button Style="{StaticResource emptyButton}" Cursor="Hand"  Command="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid},AncestorLevel=2},Path=DataContext.SelectedTab.DeleteCommand}" CommandParameter="{Binding}">
+                                                <StackPanel Orientation="Horizontal">
+                                                    <TextBlock FontSize="16" Text="Delete" VerticalAlignment="Center"></TextBlock>
+                                                    <materialDesign:PackIcon VerticalAlignment="Center" Margin="5 0 0 0" Kind="Delete" Width="18"  />
+                                                </StackPanel>
+                                            </Button>
+                                            </DataTemplate>
+                                        </DataGridTemplateColumn.CellTemplate>
+                                    </DataGridTemplateColumn>
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </Grid>
+                    </DockPanel>
                 </Grid>
             </Grid>
         </Grid>
-
+        <DockPanel VerticalAlignment="Top">
+            <Button DockPanel.Dock="Top" HorizontalAlignment="Right" Width="170" Height="36" Margin="0 0 26 0" VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                <StackPanel Orientation="Horizontal">
+                    <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                </StackPanel>
+            </Button>
+            
+        </DockPanel>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config
index da5ed8abc..f9bce0fbf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config
@@ -6,6 +6,8 @@
   <package id="MahApps.Metro" version="1.5.0" targetFramework="net461" />
   <package id="MaterialDesignColors" version="1.1.2" targetFramework="net461" />
   <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net461" />
+  <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net461" />
+  <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
   <package id="OxyPlot.Core" version="2.0.0" targetFramework="net461" />
   <package id="OxyPlot.Wpf" version="2.0.0" targetFramework="net461" />
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
index 574439852..2b962d56b 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
@@ -26,6 +26,16 @@ namespace Tango.BL.Builders
                 }
             });
         }
+        public virtual RMLExtensionTestResultsCollectionBuilder WithTestResultsFiles()
+        {
+            return AddStep(3, () =>
+            {
+                foreach (var result in Entities.ToList())
+                {
+                    Context.RmlExtensionTestResultsFiles.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).OrderBy(x => x.FileName).ToList();
+                }
+            });
+        }
         public virtual RMLExtensionTestResultsCollectionBuilder ForRMLExtension(String rmlExtensionGUID)
         {
             return AddQueryStep(0, (query) =>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultsFileDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultsFileDTO.cs
new file mode 100644
index 000000000..0e06e750e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultsFileDTO.cs
@@ -0,0 +1,14 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.DTO
+{
+    public class RmlExtensionTestResultsFileDTO : RmlExtensionTestResultsFileDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultsFileDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultsFileDTOBase.cs
new file mode 100644
index 000000000..f06cdb159
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultsFileDTOBase.cs
@@ -0,0 +1,49 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class RmlExtensionTestResultsFileDTOBase : ObservableEntityDTO<RmlExtensionTestResultsFileDTO, RmlExtensionTestResultsFile>
+    {
+
+        /// <summary>
+        /// rml extension test results guid
+        /// </summary>
+        public String RmlExtensionTestResultsGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// file name
+        /// </summary>
+        public String FileName 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// file path
+        /// </summary>
+        public String FilePath 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
index 561b311d7..7f6804039 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
@@ -93,6 +93,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Machine> MachineChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResultsFile>> RmlExtensionTestResultsFilesChanged;
+
         public event EventHandler<SynchronizedObservableCollection<RubbingResult>> RubbingResultsChanged;
 
         protected String _rmlsextensionsguid;
@@ -1046,6 +1048,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase rml extension test results files.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles
+        {
+            get 
+            {
+                return _rmlextensiontestresultsfiles; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresultsfiles != value)
+                {
+                    _rmlextensiontestresultsfiles = value;
+
+                    OnRmlExtensionTestResultsFilesChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<RubbingResult> _rubbingresults;
 
         /// <summary>
@@ -1369,6 +1396,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionTestResultsFiles has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection<RmlExtensionTestResultsFile> rmlextensiontestresultsfiles)
+        {
+            RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles);
+            RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles));
+        }
+
+        /// <summary>
         /// Called when the RubbingResults has changed.
         /// </summary>
         protected virtual void OnRubbingResultsChanged(SynchronizedObservableCollection<RubbingResult> rubbingresults)
@@ -1385,6 +1421,8 @@ namespace Tango.BL.Entities
 
             TensileResults = new SynchronizedObservableCollection<TensileResult>();
 
+            RmlExtensionTestResultsFiles = new SynchronizedObservableCollection<RmlExtensionTestResultsFile>();
+
             RubbingResults = new SynchronizedObservableCollection<RubbingResult>();
 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultsFile.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultsFile.cs
new file mode 100644
index 000000000..5ae38f7f5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultsFile.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class RmlExtensionTestResultsFile : RmlExtensionTestResultsFileBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultsFileBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultsFileBase.cs
new file mode 100644
index 000000000..37cc8fd4a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultsFileBase.cs
@@ -0,0 +1,182 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+using System.ComponentModel;
+using Tango.Core.CustomAttributes;
+
+namespace Tango.BL.Entities
+{
+    [Table("RML_EXTENSION_TEST_RESULTS_FILES")]
+    public abstract class RmlExtensionTestResultsFileBase : ObservableEntity<RmlExtensionTestResultsFile>
+    {
+
+        public event EventHandler<String> FileNameChanged;
+
+        public event EventHandler<String> FilePathChanged;
+
+        public event EventHandler<RmlExtensionTestResult> RmlExtensionTestResultsChanged;
+
+        protected String _rmlextensiontestresultsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultsfilebase rml extension test results guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_TEST_RESULTS_GUID")]
+        [ForeignKey("RmlExtensionTestResults")]
+
+        public  String RmlExtensionTestResultsGuid
+        {
+            get 
+            {
+                return _rmlextensiontestresultsguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresultsguid != value)
+                {
+                    _rmlextensiontestresultsguid = value;
+
+                }
+            }
+        }
+
+        protected String _filename;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultsfilebase file name.
+        /// </summary>
+
+        [Column("FILE_NAME")]
+
+        public  String FileName
+        {
+            get 
+            {
+                return _filename; 
+            }
+
+            set 
+            {
+                if (_filename != value)
+                {
+                    _filename = value;
+
+                    OnFileNameChanged(value);
+
+                }
+            }
+        }
+
+        protected String _filepath;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultsfilebase file path.
+        /// </summary>
+
+        [Column("FILE_PATH")]
+
+        public  String FilePath
+        {
+            get 
+            {
+                return _filepath; 
+            }
+
+            set 
+            {
+                if (_filepath != value)
+                {
+                    _filepath = value;
+
+                    OnFilePathChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlExtensionTestResult _rmlextensiontestresults;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultsfilebase rml extension test results.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlExtensionTestResult RmlExtensionTestResults
+        {
+            get 
+            {
+                return _rmlextensiontestresults; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresults != value)
+                {
+                    _rmlextensiontestresults = value;
+
+                    if (RmlExtensionTestResults != null)
+                    {
+                        RmlExtensionTestResultsGuid = RmlExtensionTestResults.Guid;
+                    }
+
+                    OnRmlExtensionTestResultsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the FileName has changed.
+        /// </summary>
+        protected virtual void OnFileNameChanged(String filename)
+        {
+            FileNameChanged?.Invoke(this, filename);
+            RaisePropertyChanged(nameof(FileName));
+        }
+
+        /// <summary>
+        /// Called when the FilePath has changed.
+        /// </summary>
+        protected virtual void OnFilePathChanged(String filepath)
+        {
+            FilePathChanged?.Invoke(this, filepath);
+            RaisePropertyChanged(nameof(FilePath));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionTestResults has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestResultsChanged(RmlExtensionTestResult rmlextensiontestresults)
+        {
+            RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults);
+            RaisePropertyChanged(nameof(RmlExtensionTestResults));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionTestResultsFileBase" /> class.
+        /// </summary>
+        public RmlExtensionTestResultsFileBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index 382bb0dca..16e44759b 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -759,6 +759,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the RmlExtensionTestResultsFiles.
+        /// </summary>
+        public DbSet<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the Rmls.
         /// </summary>
         public DbSet<Rml> Rmls 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index a95bbd787..b18a39cb6 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -3329,6 +3329,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResultsFiles.
+        /// </summary>
+        public ObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles
+        {
+            get 
+            {
+                return _rmlextensiontestresultsfiles; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensiontestresultsfilesViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResultsFiles View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionTestResultsFilesViewSource
+        {
+            get 
+            {
+                return _rmlextensiontestresultsfilesViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Rml> _rmls;
         /// <summary>
         /// Gets or sets the Rmls.
@@ -4383,6 +4419,8 @@ namespace Tango.BL
 
             RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData);
 
+            RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles);
+
             RmlsViewSource = CreateCollectionView(Rmls);
 
             RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index f4ccd1d88..d5f9c0bb9 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -3329,6 +3329,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResultsFiles.
+        /// </summary>
+        public ObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles
+        {
+            get 
+            {
+                return _rmlextensiontestresultsfiles; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensiontestresultsfilesViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResultsFiles View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionTestResultsFilesViewSource
+        {
+            get 
+            {
+                return _rmlextensiontestresultsfilesViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Rml> _rmls;
         /// <summary>
         /// Gets or sets the Rmls.
@@ -4383,6 +4419,8 @@ namespace Tango.BL
 
             RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData);
 
+            RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles);
+
             RmlsViewSource = CreateCollectionView(Rmls);
 
             RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index bcc6e303e..76f521843 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -305,6 +305,8 @@
     <Compile Include="DTO\RmlExtensionColorShadesTestsDataDTOBase.cs" />
     <Compile Include="DTO\RmlExtensionTestResultDTO.cs" />
     <Compile Include="DTO\RmlExtensionTestResultDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionTestResultsFileDTO.cs" />
+    <Compile Include="DTO\RmlExtensionTestResultsFileDTOBase.cs" />
     <Compile Include="DTO\RmlsExtensionDTO.cs" />
     <Compile Include="DTO\RmlsExtensionDTOBase.cs" />
     <Compile Include="DTO\RmlsSpoolDTO.cs" />
@@ -489,6 +491,8 @@
     <Compile Include="Entities\RmlExtensionColorShadesTestsDataBase.cs" />
     <Compile Include="Entities\RmlExtensionTestResult.cs" />
     <Compile Include="Entities\RmlExtensionTestResultBase.cs" />
+    <Compile Include="Entities\RmlExtensionTestResultsFile.cs" />
+    <Compile Include="Entities\RmlExtensionTestResultsFileBase.cs" />
     <Compile Include="Entities\RmlsExtension.cs" />
     <Compile Include="Entities\RmlsExtensionBase.cs" />
     <Compile Include="Entities\RmlsSpoolBase.cs" />
@@ -803,7 +807,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.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs
index b1a5ae94f..c530978d8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs
@@ -18,6 +18,7 @@ namespace Tango.DAL.Remote.DB
         public RML_EXTENSION_TEST_RESULTS()
         {
             this.TENSILE_RESULTS = new HashSet<TENSILE_RESULTS>();
+            this.RML_EXTENSION_TEST_RESULTS_FILES = new HashSet<RML_EXTENSION_TEST_RESULTS_FILES>();
             this.RUBBING_RESULTS = new HashSet<RUBBING_RESULTS>();
         }
     
@@ -62,6 +63,8 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<TENSILE_RESULTS> TENSILE_RESULTS { get; set; }
         public virtual MACHINE MACHINE { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_TEST_RESULTS_FILES> RML_EXTENSION_TEST_RESULTS_FILES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RUBBING_RESULTS> RUBBING_RESULTS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS_FILES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS_FILES.cs
new file mode 100644
index 000000000..5d51a4c8a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS_FILES.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class RML_EXTENSION_TEST_RESULTS_FILES
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; }
+        public string FILE_NAME { get; set; }
+        public string FILE_PATH { get; set; }
+    
+        public virtual RML_EXTENSION_TEST_RESULTS RML_EXTENSION_TEST_RESULTS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index c89fc2a1f..17f6c87f0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -117,6 +117,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<RML_EXTENSION_COLOR_SHADES> RML_EXTENSION_COLOR_SHADES { get; set; }
         public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS> RML_EXTENSION_COLOR_SHADES_TESTS { get; set; }
         public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS_DATA> RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; }
+        public virtual DbSet<RML_EXTENSION_TEST_RESULTS_FILES> RML_EXTENSION_TEST_RESULTS_FILES { get; set; }
         public virtual DbSet<RML> RMLS { get; set; }
         public virtual DbSet<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index ae70f1ed6..09dded898 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1219,6 +1219,17 @@
           <Property Name="THREAD_COF" Type="float" />
           <Property Name="THREAD_LUB" Type="float" />
         </EntityType>
+        <EntityType Name="RML_EXTENSION_TEST_RESULTS_FILES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="FILE_NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="FILE_PATH" Type="nvarchar(max)" Nullable="false" />
+        </EntityType>
         <EntityType Name="RMLS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2776,6 +2787,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS">
+          <End Role="RML_EXTENSION_TEST_RESULTS" Type="Self.RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_TEST_RESULTS_FILES" Type="Self.RML_EXTENSION_TEST_RESULTS_FILES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_TEST_RESULTS_FILES">
+              <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RML_EXTENSION_TEST_RESULTS_MACHINES">
           <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3435,6 +3460,7 @@
           <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS" EntityType="Self.RML_EXTENSION_COLOR_SHADES_TESTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="Self.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RML_EXTENSION_TEST_RESULTS" EntityType="Self.RML_EXTENSION_TEST_RESULTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_TEST_RESULTS_FILES" EntityType="Self.RML_EXTENSION_TEST_RESULTS_FILES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS" EntityType="Self.RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS_EXTENSIONS" EntityType="Self.RMLS_EXTENSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS_SPOOLS" EntityType="Self.RMLS_SPOOLS" Schema="dbo" store:Type="Tables" />
@@ -3785,6 +3811,10 @@
             <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
             <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" Association="Self.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS">
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+            <End Role="RML_EXTENSION_TEST_RESULTS_FILES" EntitySet="RML_EXTENSION_TEST_RESULTS_FILES" />
+          </AssociationSet>
           <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_MACHINES" Association="Self.FK_RML_EXTENSION_TEST_RESULTS_MACHINES">
             <End Role="MACHINES" EntitySet="MACHINES" />
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
@@ -4123,6 +4153,7 @@
           <EntitySet Name="RML_EXTENSION_COLOR_SHADES" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" />
           <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" />
           <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" />
+          <EntitySet Name="RML_EXTENSION_TEST_RESULTS_FILES" EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" />
           <EntitySet Name="RMLS" EntityType="RemoteModel.RML" />
           <EntitySet Name="RMLS_SPOOLS" EntityType="RemoteModel.RMLS_SPOOLS" />
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
@@ -4523,6 +4554,10 @@
             <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
             <End Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS">
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+            <End Role="RML_EXTENSION_TEST_RESULTS_FILES" EntitySet="RML_EXTENSION_TEST_RESULTS_FILES" />
+          </AssociationSet>
           <AssociationSet Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
             <End Role="RUBBING_RESULTS" EntitySet="RUBBING_RESULTS" />
@@ -4679,6 +4714,7 @@
           <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_RMLS_EXTENSIONS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RMLS_EXTENSIONS" />
           <NavigationProperty Name="TENSILE_RESULTS" Relationship="RemoteModel.FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="TENSILE_RESULTS" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="MACHINE" />
+          <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS_FILES" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RML_EXTENSION_TEST_RESULTS_FILES" />
           <NavigationProperty Name="RUBBING_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RUBBING_RESULTS" />
           </EntityType>
         <EntityType Name="RMLS_EXTENSIONS">
@@ -6333,6 +6369,18 @@
           <Property Name="DELTA_E" Type="Double" Nullable="false" />
           <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" />
         </EntityType>
+        <EntityType Name="RML_EXTENSION_TEST_RESULTS_FILES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="FILE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="FILE_PATH" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS_FILES" ToRole="RML_EXTENSION_TEST_RESULTS" />
+        </EntityType>
         <EntityType Name="RML">
           <Key>
             <PropertyRef Name="GUID" />
@@ -7983,6 +8031,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS">
+          <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" Role="RML_EXTENSION_TEST_RESULTS_FILES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_TEST_RESULTS_FILES">
+              <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
           <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -9649,6 +9711,18 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_TEST_RESULTS_FILES">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_TEST_RESULTS_FILES">
+                <ScalarProperty Name="FILE_PATH" ColumnName="FILE_PATH" />
+                <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" />
+                <ScalarProperty Name="RML_EXTENSION_TEST_RESULTS_GUID" ColumnName="RML_EXTENSION_TEST_RESULTS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="RMLS">
             <EntityTypeMapping TypeName="RemoteModel.RML">
               <MappingFragment StoreEntitySet="RMLS">
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 a72a68e1f..859ff927d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,104 +5,105 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="86">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="14.125" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="41.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="50.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="57.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="63.75" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="2.75" PointY="9.125" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="22.125" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="3.375" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="34.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="73.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="68.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="66.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="15.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="29.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="56.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="67.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.75" PointY="76.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8" PointY="75.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="60.875" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="31.625" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="16.75" PointY="6.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="10.5" PointY="67.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12.75" PointY="42.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="10.5" PointY="71.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12.75" PointY="47" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="78.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="10.5" PointY="75.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12.75" PointY="50.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="48.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="52" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="53.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.5" PointY="80.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="8.75" PointY="59" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="33" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="17.75" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.25" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="26" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="2.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="78.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="47.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="51.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.25" PointY="32" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="11.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="72.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="87" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="38" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="41" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="12.375" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="12.625" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Width="1.5" PointX="8.25" PointY="55.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Width="1.5" PointX="10.5" PointY="55.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Width="1.5" PointX="15.75" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Width="1.5" PointX="18" PointY="30.75" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" Width="1.5" PointX="8.25" PointY="63.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Width="1.5" PointX="10.5" PointY="63.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Width="1.5" PointX="12.75" PointY="62.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="17.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="22" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="4.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="13.25" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="10.25" PointY="39.25" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="18.75" PointY="6.125" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="9.125" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="18.25" PointY="26.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="19.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="19.75" PointY="14.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="19.75" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="19.75" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="6.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="21.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="26.125" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="33.875" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="58.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="69.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="72.75" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="8.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="75.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="62.625" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="82.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="78.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="58.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="28.875" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="30.375" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="10.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="86.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="81.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="11.5" PointY="71.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="13.75" PointY="81.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="11.5" PointY="93.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="13.75" PointY="86.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="8.5" PointY="95" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="10.75" PointY="82.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="94.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="87.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="90.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="85.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="81.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="94.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="90" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="42.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="41.125" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="47" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="66.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="53.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="31.75" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="39.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="60.5" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="58.25" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.75" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="2.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Width="1.5" PointX="8.25" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Width="1.5" PointX="10.5" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Width="1.5" PointX="13.75" PointY="43.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Width="1.5" PointX="16" PointY="43" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" Width="1.5" PointX="8.25" PointY="75.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Width="1.5" PointX="10.5" PointY="75.375" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Width="1.5" PointX="12.75" PointY="74.375" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" Width="1.5" PointX="14.75" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="38.125" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="38.25" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="14.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="32" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="12.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="11.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="14.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="16.75" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="26.25" />
         <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.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 10f151494..da4624d61 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -324,6 +324,9 @@
     <Compile Include="DB\RML_EXTENSION_TEST_RESULTS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\RML_EXTENSION_TEST_RESULTS_FILES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\ROLE.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -479,7 +482,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file