1 files changed, 55 insertions, 7 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
index 12c759c1a..8c42a3a44 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
@@ -3,7 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
 using Tango.PPC.Common;
+using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.UI.Views;
 using Tango.SharedUI.Controls;
@@ -12,23 +15,68 @@ namespace Tango.PPC.UI.Navigation
 {
     public class DefaultNavigationManager : INavigationManager
     {
+        private IPPCModuleLoader _moduleLoader;
+
+        public DefaultNavigationManager(IPPCModuleLoader moduleLoader)
+        {
+            _moduleLoader = moduleLoader;
+        }
+
         public void NavigateTo(NavigationView view)
         {
-            NavigationControl[] controls = new NavigationControl[]
+            if (view == NavigationView.HomeModule)
             {
-                MainView.Instance.NavigationControl,
-                LayoutView.Instance.NavigationControl
-            };
-
-            var control = controls.Where(x => x.Elements.ToList().Exists(y => NavigationControl.GetNavigationName(y) == view.ToString())).SingleOrDefault();
-            control.NavigateTo(view.ToString());
+                MainView.Instance.NavigationControl.NavigateTo(NavigationView.LayoutView.ToString());
+                var firstModule = _moduleLoader.UserModules.FirstOrDefault();
+                LayoutView.Instance.NavigationControl.NavigateTo(firstModule.Name);
+            }
+            else
+            {
+                MainView.Instance.NavigationControl.NavigateTo(view.ToString());
+            }
         }
 
         public void NavigateTo<T>() where T : IPPCModule
         {
+            MainView.Instance.NavigationControl.NavigateTo(NavigationView.LayoutView.ToString());
             var navigationControl = LayoutView.Instance.NavigationControl;
+            var module = _moduleLoader.UserModules.SingleOrDefault(x => x.GetType() == typeof(T));
+            navigationControl.NavigateTo(module.Name);
+        }
 
+        public void NavigateTo<T>(string viewPath) where T : IPPCModule
+        {
+            NavigateTo<T>(viewPath.Split(','));
+        }
 
+        public void NavigateTo<T>(params String[] viewPath) where T : IPPCModule
+        {
+            MainView.Instance.NavigationControl.NavigateTo(NavigationView.LayoutView.ToString());
+            var navigationControl = LayoutView.Instance.NavigationControl;
+            var module = _moduleLoader.UserModules.SingleOrDefault(x => x.GetType() == typeof(T));
+            var moduleView = navigationControl.NavigateTo(module.Name);
+
+            var moduleNavigation = moduleView.FindChildOffline<NavigationControl>();
+
+            foreach (var view in viewPath)
+            {
+                moduleNavigation.RegisterForLoadedOrNow(async (x, e) =>
+                {
+                    await Task.Delay(100);
+                    var v = moduleNavigation.NavigateTo(view);
+
+                    if (view != viewPath.Last())
+                    {
+                        moduleNavigation = v.FindChildOffline<NavigationControl>();
+                    }
+                });
+            }
+        }
+
+        public void NavigateTo(string moduleName)
+        {
+            var navigationControl = LayoutView.Instance.NavigationControl;
+            navigationControl.NavigateTo(moduleName);
         }
     }
 }