Implemented NavigationControl for better performance!!!

Redesign of machine studio module initialization.

22 files changed, 110 insertions, 81 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs
index 3e63051ee..bdb7b136f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs
@@ -38,11 +38,11 @@ namespace Tango.MachineStudio.ColorLab
             }
         }
 
-        public override FrameworkElement MainView
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs
index b53f28bd4..4b2fe4074 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs
@@ -34,9 +34,15 @@ namespace Tango.MachineStudio.DB
         public override BitmapSource Image => SharedUI.Helpers.ResourceHelper.GetImageFromResources("Images/db.png");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MainDBView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainDBView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs
index 38e82257f..eb463e3c2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs
@@ -53,13 +53,13 @@ namespace Tango.MachineStudio.DataCapture
         }
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
index 9ac8de012..166a3212a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
@@ -35,9 +35,15 @@ namespace Tango.MachineStudio.Developer
         public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/developer.jpg");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MainView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs
index e92546b47..ff8b0320d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs
@@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Developer.Navigation
         public void NavigateTo(DeveloperNavigationView view)
         {
             LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
-            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainView.Instance.TransitionControl.NavigateTo(view.ToString());
         }
     }
 }
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 036b01e34..377b15610 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
@@ -36,6 +36,8 @@ using System.Media;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.MachineStudio.Common.Speech;
 using Microsoft.Practices.ServiceLocation;
+using System.Threading;
+using Tango.SharedUI.Helpers;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -1361,7 +1363,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     _blockInvalidateCommands = false;
                     InvalidateRelayCommands();
 
+                    UIHelper.DoEvents();
                     _navigation.NavigateTo(DeveloperNavigationView.JobView);
+
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index c4915a4c8..a3ac2f3b9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -395,19 +395,11 @@
 
 
             <Grid Grid.Row="1">
-                <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide">
-                    <controls:MultiTransitionControl.Controls>
-                        <ContentControl Tag="MachineJobSelectionView">
-                            <local:MachineJobSelectionView/>
-                        </ContentControl>
-                        <ContentControl Tag="JobView">
-                            <local:JobView/>
-                        </ContentControl>
-                        <ContentControl Tag="RunningJobView">
-                            <local:RunningJobView/>
-                        </ContentControl>
-                    </controls:MultiTransitionControl.Controls>
-                </controls:MultiTransitionControl>
+                <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide" KeepElementsAttached="True">
+                    <local:MachineJobSelectionView controls:NavigationControl.NavigationName="MachineJobSelectionView" />
+                    <local:JobView controls:NavigationControl.NavigationName="JobView" />
+                    <local:RunningJobView controls:NavigationControl.NavigationName="RunningJobView" />
+                </controls:NavigationControl>
             </Grid>
         </Grid>
     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/HardwareDesignerModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/HardwareDesignerModule.cs
index 71b86b54a..3c4d6e36a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/HardwareDesignerModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/HardwareDesignerModule.cs
@@ -39,11 +39,14 @@ namespace Tango.MachineStudio.HardwareDesigner
             }
         }
 
-        public override FrameworkElement MainView
+        /// <summary>
+        /// Gets the module entry point view type.
+        /// </summary>
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs
index 91a9f51b0..b389c121e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/LoggingModule.cs
@@ -38,11 +38,14 @@ namespace Tango.MachineStudio.Logging
             }
         }
 
-        public override FrameworkElement MainView
+        /// <summary>
+        /// Gets the module entry point view type.
+        /// </summary>
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs
index b86df7b0f..496baf4c4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Navigation/LoggingNavigationManager.cs
@@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Logging.Navigation
         public void NavigateTo(LoggingNavigationView view)
         {
             LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
-            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainView.Instance.TransitionControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index d51607004..ffb16fed4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -103,10 +103,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             IsRealTime = true;
             RealTimePaused = true;
 
-            SelectedDate = Dates.Last();
+            SelectedDate = Dates.LastOrDefault();
 
-            MinDate = Dates.Min();
-            MaxDate = Dates.Max();
+            if (Dates.Count > 0)
+            {
+                MinDate = Dates.Min();
+                MaxDate = Dates.Max();
+            }
 
             LogManager.NewLog += LogManager_NewLog;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
index 126f61402..959d294c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
@@ -105,10 +105,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             IsRealTime = true;
             RealTimePaused = true;
 
-            SelectedDate = Dates.Last();
+            SelectedDate = Dates.LastOrDefault();
 
-            MinDate = Dates.Min();
-            MaxDate = Dates.Max();
+            if (Dates.Count > 0)
+            {
+                MinDate = Dates.Min();
+                MaxDate = Dates.Max();
+            }
 
             MachineOperator.EmbeddedLogManager.NewLog += EmbeddedLogManager_NewLog;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml
index bf1bc8778..29a563c72 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml
@@ -16,24 +16,12 @@
              d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:EventsViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.EventsViewVM}">
 
     <Grid>
-        <controls:MultiTransitionControl x:Name="TransitionControl" x:FieldModifier="internal" TransitionType="Slide">
-            <controls:MultiTransitionControl.Controls>
-                <ContentControl Tag="HomeView">
-                    <local:HomeView/>
-                </ContentControl>
-                <ContentControl Tag="ApplicationLogsView">
-                    <local:ApplicationLogsView/>
-                </ContentControl>
-                <ContentControl Tag="EmbeddedLogsView">
-                    <local:EmbeddedLogsView/>
-                </ContentControl>
-                <ContentControl Tag="EventsView">
-                    <local:EventsView/>
-                </ContentControl>
-                <ContentControl Tag="TimelineView">
-                    <local:TimelineWrapperView />
-                </ContentControl>
-            </controls:MultiTransitionControl.Controls>
-        </controls:MultiTransitionControl>
+        <controls:NavigationControl x:Name="TransitionControl" x:FieldModifier="internal" TransitionType="Slide">
+            <local:HomeView controls:NavigationControl.NavigationName="HomeView" />
+            <local:ApplicationLogsView controls:NavigationControl.NavigationName="ApplicationLogsView" />
+            <local:EmbeddedLogsView controls:NavigationControl.NavigationName="EmbeddedLogsView" />
+            <local:EventsView controls:NavigationControl.NavigationName="EventsView" />
+            <local:TimelineWrapperView controls:NavigationControl.NavigationName="TimelineWrapperView" />
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs
index c770695c6..9b37303c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs
@@ -35,9 +35,15 @@ namespace Tango.MachineStudio.MachineDesigner
         public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/machine-designer-module.jpg");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MainView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs
index 62a208d87..aa8041669 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs
@@ -35,9 +35,15 @@ namespace Tango.MachineStudio.Stubs
         public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/stubs.jpg");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MainView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs
index 1a05c9248..29fc95aec 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs
@@ -35,9 +35,15 @@ namespace Tango.MachineStudio.Synchronization
         public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/synchronization.jpg");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MainView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs
index 92293e7d0..4ced0fb30 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs
@@ -35,9 +35,15 @@ namespace Tango.MachineStudio.Technician
         public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/technician.jpg");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MachineTechView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MachineTechView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
index b335f2d69..b56962df7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
@@ -16,7 +16,7 @@ namespace Tango.MachineStudio.UsersAndRoles.Navigation
         public void NavigateTo(UsersAndRolesNavigationView view)
         {
             LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
-            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainView.Instance.TransitionControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
index c0d1326cf..ac471db06 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
@@ -38,11 +38,14 @@ namespace Tango.MachineStudio.UsersAndRoles
             }
         }
 
-        public override FrameworkElement MainView
+        /// <summary>
+        /// Gets the module entry point view type.
+        /// </summary>
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
index 90166f445..efe58b363 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
@@ -11,18 +11,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid>
-        <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide">
-            <controls:MultiTransitionControl.Controls>
-                <ContentControl Tag="OrganizationSelectionView">
-                    <local:OrganizationSelectionView/>
-                </ContentControl>
-                <ContentControl Tag="OrganizationManagementView">
-                    <local:OrganizationManagementView/>
-                </ContentControl>
-                <ContentControl Tag="UserManagementView">
-                    <local:UserManagementView/>
-                </ContentControl>
-            </controls:MultiTransitionControl.Controls>
-        </controls:MultiTransitionControl>
+        <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide">
+            <local:OrganizationSelectionView controls:NavigationControl.NavigationName="OrganizationSelectionView" />
+            <local:OrganizationManagementView controls:NavigationControl.NavigationName="OrganizationManagementView" />
+            <local:UserManagementView controls:NavigationControl.NavigationName="UserManagementView" />
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
index e2c44a584..b9f513a1e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
@@ -13,20 +13,21 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using static Tango.SharedUI.Controls.MultiTransitionControl;
+using static Tango.SharedUI.Controls.NavigationControl;
 
 namespace Tango.MachineStudio.UsersAndRoles.Views
 {
     /// <summary>
     /// Interaction logic for OrganizationManagementView.xaml
     /// </summary>
-    public partial class OrganizationManagementView : UserControl , ITransitionView
+    public partial class OrganizationManagementView : UserControl , INavigationView
     {
         public OrganizationManagementView()
         {
             InitializeComponent();
         }
 
-        public void OnTransitionCompleted()
+        public void OnNavigated()
         {
             address_auto.Text = "";
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
index f2ff25637..d25932403 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
@@ -16,13 +16,14 @@ using Tango.BL.Entities;
 using Tango.DragAndDrop;
 using Tango.MachineStudio.UsersAndRoles.ViewModels;
 using static Tango.SharedUI.Controls.MultiTransitionControl;
+using static Tango.SharedUI.Controls.NavigationControl;
 
 namespace Tango.MachineStudio.UsersAndRoles.Views
 {
     /// <summary>
     /// Interaction logic for UserManagementView.xaml
     /// </summary>
-    public partial class UserManagementView : UserControl, ITransitionView
+    public partial class UserManagementView : UserControl, INavigationView
     {
         private MainViewVM _vm;
         
@@ -49,7 +50,7 @@ namespace Tango.MachineStudio.UsersAndRoles.Views
             }
         }
 
-        public void OnTransitionCompleted()
+        public void OnNavigated()
         {
             address_auto.Text = "";
         }