merge

2 files changed, 48 insertions, 0 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 fd36d0d13..76eda9ac0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Threading;
 using Tango.Core.Commands;
 using Tango.Core.DI;
 using Tango.Integration.Operation;
@@ -88,6 +89,11 @@ namespace Tango.PPC.UI.ViewModels
         /// Gets or sets the update command.
         /// </summary>
         public RelayCommand UpdateCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the storage command.
+        /// </summary>
+        public RelayCommand StorageCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -108,6 +114,13 @@ namespace Tango.PPC.UI.ViewModels
             {
                 NavigationManager.NavigateTo(NavigationView.MachineUpdateView);
                 TangoIOC.Default.GetInstance<MachineUpdateViewVM>().CheckForUpdates();
+                IsMenuOpened = false;
+            });
+
+            StorageCommand = new RelayCommand(() => 
+            {
+                NavigationManager.NavigateTo(NavigationView.StorageView);
+                IsMenuOpened = false;
             });
         }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index e207c30b3..b01be3734 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Threading;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
 using Tango.PPC.Common;
@@ -22,11 +23,45 @@ namespace Tango.PPC.UI.ViewModels
     /// <seealso cref="Tango.PPC.Common.PPCViewModel" />
     public class MainViewVM : PPCViewModel
     {
+        private DispatcherTimer _date_timer;
+
+        private DateTime _currentDateTime;
+        /// <summary>
+        /// Gets or sets the current date time.
+        /// </summary>
+        public DateTime CurrentDateTime
+        {
+            get { return _currentDateTime; }
+            set { _currentDateTime = value; RaisePropertyChangedAuto(); }
+        }
+
+        public MainViewVM()
+        {
+            _date_timer = new DispatcherTimer();
+            _date_timer.Interval = TimeSpan.FromSeconds(1);
+            _date_timer.Tick += _date_timer_Tick;
+            _date_timer.Start();
+        }
+
         /// <summary>
         /// Called when the application has been started.
         /// </summary>
         public override void OnApplicationStarted()
         {
         }
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handles the Tick event of the _date_timer.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        private void _date_timer_Tick(object sender, EventArgs e)
+        {
+            CurrentDateTime = DateTime.Now;
+        }
+
+        #endregion
     }
 }