aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-01-07 16:06:38 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-01-07 16:06:38 +0200
commite111c33bc87acf40202f9e5423e21b087a366f07 (patch)
treefac6d85ec3589620b1daea9a9f740a2120b0ca10 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
parent6da42fd28ffbb680d85bb9e695520713ff51022a (diff)
downloadTango-e111c33bc87acf40202f9e5423e21b087a366f07.tar.gz
Tango-e111c33bc87acf40202f9e5423e21b087a366f07.zip
Added new events !!!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs21
2 files changed, 3 insertions, 20 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index 492e23963..4ebf3d96d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -141,7 +141,7 @@ namespace Tango.MachineStudio.UI.ViewModels
_authenticationProvider.Login(Email, Password);
- _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
+ _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!");
_navigationManager.NavigateTo(NavigationView.MainView);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index e3a8b4e7c..c13c7379a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -20,7 +20,6 @@ using Tango.MachineStudio.Common;
using Tango.MachineStudio.Common.Authentication;
using Tango.MachineStudio.Common.Diagnostics;
using Tango.MachineStudio.Common.EventLogging;
-using Tango.MachineStudio.Common.Html;
using Tango.MachineStudio.Common.Messages;
using Tango.MachineStudio.Common.Modules;
using Tango.MachineStudio.Common.Navigation;
@@ -54,7 +53,6 @@ namespace Tango.MachineStudio.UI.ViewModels
private bool _isDisconnecting;
private Thread _updateCheckThread;
private IEventLogger _eventLogger;
- private IHtmlPresenter _htmlPresenter;
private MachineStudioSettings _settings;
/// <summary>
@@ -282,7 +280,7 @@ namespace Tango.MachineStudio.UI.ViewModels
IEventLogger eventLogger,
IDiagnosticsFrameProvider frameProvider,
ISpeechProvider speechProvider,
- IHtmlPresenter htmlPresenter, TeamFoundationServiceExtendedClient tfs) : base()
+ TeamFoundationServiceExtendedClient tfs) : base()
{
TFSClient = tfs;
_eventLogger = eventLogger;
@@ -293,7 +291,6 @@ namespace Tango.MachineStudio.UI.ViewModels
ApplicationManager = applicationManager;
DiagnosticsFrameProvider = frameProvider;
SpeechProvider = speechProvider;
- _htmlPresenter = htmlPresenter;
_settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
@@ -782,21 +779,7 @@ namespace Tango.MachineStudio.UI.ViewModels
/// <param name="machineEvent">The HTML page.</param>
private async void ResolveMachineEvent(MachinesEvent machineEvent)
{
- if (machineEvent.EventType.HtmlPage != null)
- {
- if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage))
- {
- if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable)
- {
- _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name));
- await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type);
- }
- }
- }
- else
- {
- _notificationProvider.ShowWarning("Could not locate guidance content for the specified event.");
- }
+
}
/// <summary>