From cde89b7390bcf308701e196a68d364a94af2b6d5 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 20 Jul 2021 19:41:52 +0300
Subject: Save Manufacturer in YarnManufactors table on first open
 RML/RMLExtention

Related Work Items: #4219
---
 .../ViewModels/MainViewVM.cs                          | 19 +++++++++----------
 .../Views/RMLExtensionsView.xaml                      |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

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

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>
-- 
cgit v1.3.1