MS. RML Extensions. Add RMLExtension object with import/export RML.

6 files changed, 36 insertions, 8 deletions

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 44ba71ac0..fd276ea65 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
@@ -1577,9 +1577,14 @@ namespace Tango.MachineStudio.RML.ViewModels
                             {
                                 var json = File.ReadAllText(file);
                                 var rmlFile = await Rml.FromRmlFile(db, json);
-
+                                
                                 db.Rmls.Add(rmlFile);
 
+                                if (rmlFile.RmlsExtensions != null && rmlFile.RmlsExtensions.Count > 0)
+                                {
+                                    db.RmlsExtensions.Add(rmlFile.RmlsExtensions.FirstOrDefault());
+                                }
+
                                 _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlImported, _authentication.CurrentUser, rmlFile.Name, rmlFile, "RML imported from Machine Studio.");
                             }
 
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 686d95ccc..321d4af04 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
@@ -237,7 +237,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             set { _RMLFilter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
         }
 
-        private async void OnFilterChanged()
+        public async void OnFilterChanged()
         {
             await LoadRmlExtentions();
         }
@@ -940,7 +940,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                             _allUsers.Add(model);
                         }
                     }
-                        
+                    
                     var q = (from c in db.Rmls.Where(x => x.Name.ToLower().Contains(filter))
                              join p in db.RmlsExtensions on c.Guid equals p.RmlsGuid into ps
                              from p in ps.DefaultIfEmpty()
@@ -953,7 +953,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                                  Manufacturer = x.RML.Manufacturer,
                                  Brand = x.RMLExtesion == null ? "" : (Brands.Where(y => y.Guid == x.RMLExtesion.YarnBrandGuid).Select(z => z.Name).FirstOrDefault()),
                                  LinearDensity = (int)x.RML.FiberSize,
-                                 CreatedBy = x.RMLExtesion == null ? "" : _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid).Name,
+                                 CreatedBy = (x.RMLExtesion == null || x.RMLExtesion.UsersGuid == null || null == _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid)) ? "" : _allUsers.SingleOrDefault(y => y.Guid == x.RMLExtesion.UsersGuid).Name,
                                  Created = x.RMLExtesion == null ? DateTime.Now : x.RMLExtesion.Created,
                                  LastUpdated = x.RMLExtesion == null ? DateTime.Now : x.RMLExtesion.LastUpdated,
                                  Status = x.RMLExtesion == null ? RMLExtensionStatus.New : x.RMLExtesion.RMLStatus,
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 255fd80d1..14b2f737f 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
@@ -21,7 +21,7 @@
         <localconverters:BoolToDisplayStatusConverter x:Key="BoolToDisplayStatusConverter"/>
     </UserControl.Resources>
     
-    <Grid IsEnabled="{Binding IsFree}">
+    <Grid IsEnabled="{Binding IsFree}" IsVisibleChanged="RMLExtensionsView_IsVisibleChanged">
         <DockPanel Margin="100 100 100 50" MaxWidth="1500">
             <Grid DockPanel.Dock="Top">
                 <Image Source="../Images/threads.png" Width="300" Margin="10" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs
index 03bac4bbe..1b5a5872d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionsView.xaml.cs
@@ -19,9 +19,22 @@ namespace Tango.MachineStudio.ThreadExtensions.Views
     /// </summary>
     public partial class RMLExtensionsView : UserControl
     {
+        private ViewModels.MainViewVM _vm {  get;set; }
         public RMLExtensionsView()
         {
             InitializeComponent();
+            _vm = (ViewModels.MainViewVM)this.DataContext;
+        }
+
+        private void RMLExtensionsView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((bool)e.NewValue)
+            {
+                if(_vm != null)
+                {
+                    _vm.OnFilterChanged();
+                }
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
index 166c77f11..361461586 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
@@ -125,10 +125,19 @@ namespace Tango.BL.Builders
             });
         }
 
+        public virtual RmlBuilder WithRMLExtensions()
+        {
+            return AddStep(6, () =>
+            {
+                var rmlExt = Context.RmlsExtensions.Where(x => x.RmlsGuid == Entity.Guid).FirstOrDefault();
+                if (rmlExt != null)
+                    new RmlExtensionsBuilder(Context).Set(rmlExt.Guid).Build();
+            });
+        }
+
         public override Rml Build()
         {
             var rml = base.Build();
-
             if (rml != null)
             {
                 if (rml.Cct != null)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 4c9f11127..a49b3cf84 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -126,7 +126,7 @@ namespace Tango.BL.Entities
         {
             return Task.Factory.StartNew<String>(() =>
             {
-                var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().WithSpools().Build();
+                var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().WithSpools().WithRMLExtensions().Build();
 
                 String result = rml.ToJson(new EntitySerializationStrategy()
                     .Include(() => rml.Cct)
@@ -135,6 +135,7 @@ namespace Tango.BL.Entities
                     .Include(() => rml.LiquidTypesRmls)
                     .Include(() => rml.ProcessParametersTablesGroups)
                     .Include(() => rml.RmlsSpools)
+                    .Include(() => rml.RmlsExtensions)
                     .Include(typeof(ProcessParametersTablesGroup).GetProperty(nameof(ProcessParametersTablesGroup.ProcessParametersTables))),
                     EntitySerializationFlags.IgnoreCollections | EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented);
 
@@ -176,7 +177,7 @@ namespace Tango.BL.Entities
                         rml.Lub = null;
                     }
                 }
-
+                
                 rml.LastUpdated = DateTime.UtcNow;
                 rml.Code = context.Rmls.Max(x => x.Code) + 1;