Save Manufacturer in YarnManufactors table on first open RML/RMLExtention

Related Work Items: #4219

4 files changed, 32 insertions, 11 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index cd1abff60..8d83c0a42 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1256,6 +1256,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             String filter = JobFilter.ToLower();
 
+            if (JobsCollectionView == null)
+                return;
+
             JobsCollectionView.Filter = (job) =>
             {
                 try
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 13cac9c88..bde174f07 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
@@ -184,6 +184,17 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _colorCalibrationVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private List<String> _manufacturers;
+        public List<String> Manufacturers
+        {
+            get { return _manufacturers; }
+            set
+            {
+                _manufacturers = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
         private String _RMLFilter;
         /// <summary>
         /// Gets or sets the job filter.
@@ -397,6 +408,13 @@ namespace Tango.MachineStudio.RML.ViewModels
                         }
                     }
 
+                    if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer))
+                    {
+                        _active_context.YarnManufacturers.Add(new YarnManufacturer() { Name = ActiveRML.Manufacturer });
+                        await _active_context.SaveChangesAsync();
+                        Manufacturers.Add(ActiveRML.Manufacturer);
+                    }
+
                     ActiveProcessParametersGroup = ActiveRML.ProcessParametersTablesGroups.ToList().FirstOrDefault();
                     ActiveProcessParametersTableView = CollectionViewSource.GetDefaultView(ActiveProcessParametersGroup.ProcessParametersTables);
                     ActiveProcessParametersTableView.SortDescriptions.Add(new SortDescription(nameof(ProcessParametersTable.TableIndex), ListSortDirection.Ascending));
@@ -482,6 +500,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             SpoolTypes = _active_context.SpoolTypes.ToObservableCollection();
             BtsrApplicationTypes = _active_context.BtsrApplicationTypes.ToObservableCollection();
             BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection();
+            Manufacturers = _active_context.YarnManufacturers.Select(x => x.Name).ToList();
         }
 
         private async void AddNewRml()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 10ec55958..bbabb612e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -837,15 +837,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                                  Status = x.RMLExtesion == null ? RMLExtensionStatus.New : x.RMLExtesion.RMLStatus
                              }).ToList();
                     RmlExtensions = q;
-                   // RmlExtCollectionView = CollectionViewSource.GetDefaultView(RmlExtensions);
-                   // RmlExtCollectionView.SortDescriptions.Add(new SortDescription(nameof(Rml.LastUpdated), ListSortDirection.Ascending));
-
-                    //RmlExtCollectionView.Filter = (rml) =>
-                    //{
-                    //    RmlExtensionModel r = rml as RmlExtensionModel;
-                    //    return String.IsNullOrWhiteSpace(Filter)
-                    //    || r.Name.ToLower().Contains(Filter.ToLower());
-                    //};
+                 
                 }
             }
             catch (Exception ex)
@@ -954,7 +946,14 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     ActiveRML =  new RmlBuilder(_active_context)
                         .Set(SelectedRMLExtension.RMLGuid)
                         .Build();
-                    
+
+                    if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer))
+                    {
+                        _active_context.YarnManufacturers.Add(new YarnManufacturer() { Name = ActiveRML.Manufacturer });
+                        await _active_context.SaveChangesAsync();
+                        Manufacturers.Add(ActiveRML.Manufacturer);
+                    }
+
                     var machineIdsHasTest = (from c in _active_context.ColorProcessParameters.Where(x => x.RmlsExtensionsGuid == guid)
                              select new { MichineGUID = c.MachineGuid }).
                              Union (from p in _active_context.RmlExtensionTestResults.Where(x => x.RmlsExtensionsGuid == guid)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml
index b2bff1dae..13d2cd660 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml
@@ -25,7 +25,7 @@
         <DockPanel Margin="100 100 100 50" MaxWidth="1200">
             <Grid DockPanel.Dock="Top">
                 <Image Source="../Images/threads.png" Width="300" Margin="10" />
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 10 30">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0 0 10 30">
                     <materialDesign:PackIcon Kind="Magnify" Width="26" Height="26"/>
                     <TextBox Width="300" materialDesign:HintAssist.Hint="Search by name" Text="{Binding Filter,UpdateSourceTrigger=PropertyChanged,Delay=500}"></TextBox>
                 </StackPanel>