Tech Board Module seems to be working good !!

5 files changed, 4 insertions, 45 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs
index 18cfca79d..75b4718cd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs
@@ -21,7 +21,7 @@ namespace Tango.MachineStudio.MachineDesigner.AutoComplete
         public IEnumerable GetSuggestions(string filter)
         {
             Text = filter;
-            return ObservablesEntitiesAdapter.Instance.MachineVersions.Where(x => x.Version.ToString().StartsWith(filter, StringComparison.CurrentCultureIgnoreCase) || x.Name.StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList();
+            return ObservablesStaticCollections.Instance.MachineVersions.Where(x => x.Version.ToString().StartsWith(filter, StringComparison.CurrentCultureIgnoreCase) || x.Name.StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList();
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs
deleted file mode 100644
index 01b74e8a6..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.AutoComplete.Editors;
-using Tango.BL;
-using Tango.BL.Entities;
-
-namespace Tango.MachineStudio.MachineDesigner.AutoComplete
-{
-    /// <summary>
-    /// Represents an auto-complete <see cref="Machine">Machines</see> provider.
-    /// </summary>
-    /// <seealso cref="Tango.AutoComplete.Editors.ISuggestionProvider" />
-    public class MachinesProvider : ISuggestionProvider
-    {
-        /// <summary>
-        /// Gets the suggestions.
-        /// </summary>
-        /// <param name="filter">The filter.</param>
-        /// <returns></returns>
-        public IEnumerable GetSuggestions(string filter)
-        {
-            return ObservablesEntitiesAdapter.Instance.Machines.Where(x => x.SerialNumber.StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
index 78f52b3fd..a578d0e54 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
@@ -75,7 +75,6 @@
     <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="AutoComplete\MachinesProvider.cs" />
     <Compile Include="AutoComplete\MachineVersionsProvider.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\MachineVersionDialogVM.cs" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index a819a4d1a..d2838b758 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -130,11 +130,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// </summary>
         public ISuggestionProvider MachinesProvider { get; set; }
 
-        /// <summary>
-        /// Gets or sets the versions provider.
-        /// </summary>
-        public ISuggestionProvider VersionsProvider { get; set; }
-
         #endregion
 
         #region Commands
@@ -203,11 +198,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             {
                 return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList();
             });
-
-            VersionsProvider = new SuggestionProvider((filter) =>
-            {
-                return _db.MachineVersions.Where(x => x.Version.ToString().StartsWith(filter) || x.Name.StartsWith(filter)).ToList();
-            });
         }
 
         #endregion
@@ -283,7 +273,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         InitCollections().Wait();
                         Machine = _db.Machines.Where(x => x.Guid == SelectedMachine.Guid).Include(x => x.Organization).SingleOrDefault(x => x.Guid == SelectedMachine.Guid);
-                        Configuration = _db.LoadConfiguration(x => x.Guid == Machine.ConfigurationGuid);
+                        Configuration = _db.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
 
                         SetHistory();
 
@@ -312,7 +302,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         CanWork = false;
 
-                        SelectedHistoryConfiguration = _db.LoadConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
+                        SelectedHistoryConfiguration = _db.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
                         Configuration = SelectedHistoryConfiguration;
                         Machine.Configuration = Configuration;
 
@@ -700,7 +690,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     await Task.Factory.StartNew(() =>
                     {
                         var version = _db.MachineVersions.Where(x => x.Guid == Machine.MachineVersion.Guid).Include(x => x.DefaultConfiguration).FirstOrDefault();
-                        var version_config = _db.LoadConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
+                        var version_config = _db.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
                         Configuration = version_config.Clone();
                         Machine.Configuration = Configuration;
                     });
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
index 4d75651f7..e2dd7c5a9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
@@ -17,7 +17,6 @@
 
     <UserControl.Resources>
         <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
-        <providers:MachinesProvider x:Key="MachinesProvider"></providers:MachinesProvider>
 
         <Style x:Key="draggableGrid" TargetType="Grid">
             <Setter Property="RenderTransform">