Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 32 insertions, 4 deletions

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 749a09023..a58757633 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
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using Tango.Core.Commands;
 using Tango.BL.Entities;
 using Tango.Integration.Operation;
-using Tango.Integration.Services;
+using Tango.Integration.ExternalBridge;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Controls;
@@ -39,6 +39,8 @@ using Tango.SharedUI.Helpers;
 using Tango.Core.DI;
 using Tango.MachineStudio.Common;
 using Tango.BL.ColorConversion;
+using Tango.MachineStudio.Logging.ViewModels;
+using Tango.MachineStudio.Logging.Views;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -68,6 +70,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private Thread _colorConversionThread;
         private bool _hiveOpened;
         private bool _color_changed_from_hive;
+        private bool _dialog_shown;
 
         #region Properties
 
@@ -491,6 +494,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set { _jobEvents = value; RaisePropertyChangedAuto(); }
         }
 
+        private MachinesEvent _selectedJobEvent;
+        /// <summary>
+        /// Gets or sets the selected job event.
+        /// </summary>
+        public MachinesEvent SelectedJobEvent
+        {
+            get { return _selectedJobEvent; }
+            set { _selectedJobEvent = value; RaisePropertyChangedAuto(); OnSelectedJobEventChanged(); }
+        }
+
         #endregion
 
         #region Commands
@@ -798,7 +811,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 InvokeUI(() =>
                 {
-                    JobEvents.Add(e);
+                    JobEvents.Insert(0, e);
                 });
             }
         }
@@ -1044,6 +1057,21 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #region Running Job Management
 
+        private void OnSelectedJobEventChanged()
+        {
+            if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown)
+            {
+                _dialog_shown = true;
+                _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedJobEvent), (x) =>
+                {
+
+                }, () =>
+                {
+                    _dialog_shown = false;
+                });
+            }
+        }
+
         /// <summary>
         /// Closes the job completion status bar.
         /// </summary>
@@ -1185,7 +1213,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     });
                 };
 
-                _jobHandler.Finalizing += (_, __) => 
+                _jobHandler.Finalizing += (_, __) =>
                 {
                     _speech.SpeakInfo("Finalizing job...");
                     LogManager.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
@@ -1401,7 +1429,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     Rmls = _activeJobDbContext.Rmls.ToObservableCollection();
                     WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection();
                     SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
-                    
+
 
                     LogManager.Log("Setting active job...");
                     _activeJob = _activeJobDbContext.Jobs.SingleOrDefault(x => x.Guid == SelectedMachineJob.Guid);