Working on PPC navigation history!

1 files changed, 25 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
index 8731bc7d9..99841516e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -41,6 +41,11 @@ namespace Tango.PPC.UI.ViewModels
         public RelayCommand<String> ModuleNavigationCommand { get; set; }
 
         /// <summary>
+        /// Gets or sets the menu or back command.
+        /// </summary>
+        public RelayCommand MenuOrBackCommand { get; set; }
+
+        /// <summary>
         /// Gets or sets the home command.
         /// </summary>
         public RelayCommand HomeCommand { get; set; }
@@ -50,15 +55,31 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         public LayoutViewVM()
         {
-            ModuleNavigationCommand = new RelayCommand<string>(HandleModuleNavigationCommand);
-            HomeCommand = new RelayCommand(HandleHomeCommand);
+            ModuleNavigationCommand = new RelayCommand<string>(NavigateToModule);
+            HomeCommand = new RelayCommand(NavigateHome);
+            MenuOrBackCommand = new RelayCommand(OpenMenuOrNavigateBack);
+        }
+
+        /// <summary>
+        /// Opens the menu or navigate back.
+        /// </summary>
+        private void OpenMenuOrNavigateBack()
+        {
+            if (NavigationManager.CanNavigateBack)
+            {
+                NavigationManager.NavigateBack();
+            }
+            else
+            {
+                IsMenuOpened = true;
+            }
         }
 
         /// <summary>
         /// Handles the module navigation command.
         /// </summary>
         /// <param name="moduleName">Name of the module.</param>
-        private void HandleModuleNavigationCommand(string moduleName)
+        private void NavigateToModule(string moduleName)
         {
             IsMenuOpened = false;
             NavigationManager.NavigateTo(moduleName);
@@ -67,7 +88,7 @@ namespace Tango.PPC.UI.ViewModels
         /// <summary>
         /// Handles the home command.
         /// </summary>
-        private void HandleHomeCommand()
+        private void NavigateHome()
         {
             IsMenuOpened = false;
             NavigationManager.NavigateTo(NavigationView.HomeModule);