From ecf55f4193c0a7ab273c7e8243e446a2f2c32d51 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 16 Dec 2018 08:22:45 +0200 Subject: Working on PPC tech mode & logging module. Working on PPC date picker & calendar. Implemented no-permissions view. --- Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 645456216..9b4c17831 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -95,6 +95,7 @@ namespace Tango.PPC.UI TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); + TangoIOC.Default.Register(); TangoIOC.Default.GetInstance().ContentRendered += (_, __) => @@ -176,5 +177,13 @@ namespace Tango.PPC.UI return TangoIOC.Default.GetInstance(); } } + + public static NoPermissionsViewVM NoPermissionsViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } } } \ No newline at end of file -- cgit v1.3.1 From f8138b3d641d51bba4bda9056f0b1187da6bebb6 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 16 Dec 2018 10:13:45 +0200 Subject: Some work on PPC setup and remote assistance. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 20578304 -> 20578304 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 20578304 -> 20578304 bytes .../MachineSetup/MachineSetupManager.cs | 22 ++++++++++++++++++++- .../DefaultRemoteAssistanceProvider.cs | 14 +++++++++---- .../RemoteAssistance/IRemoteAssistanceProvider.cs | 5 ++--- .../PPC/Tango.PPC.UI/ViewModelLocator.cs | 2 +- 8 files changed, 34 insertions(+), 9 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 623792e8e..cfe01aec8 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 0b0bee34f..696dc0a75 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 632cae29a..977d163d4 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index c04361480..2f3904f86 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs index 3d816c89a..ead508488 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -19,6 +19,7 @@ using Tango.Integration.Operation; using Tango.PMR.Synchronization; using Tango.PPC.Common.Application; using Tango.PPC.Common.Connection; +using Tango.PPC.Common.RemoteAssistance; using Tango.Settings; using Tango.SharedUI.Helpers; using Tango.SQLExaminer; @@ -33,6 +34,8 @@ namespace Tango.PPC.Common.MachineSetup /// public class MachineSetupManager : ExtendedObject, IMachineSetupManager { + private IRemoteAssistanceProvider _remoteAssistance; + #region Events /// @@ -58,6 +61,19 @@ namespace Tango.PPC.Common.MachineSetup #endregion + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + /// The remote assistance. + public MachineSetupManager(IRemoteAssistanceProvider remoteAssistance) + { + _remoteAssistance = remoteAssistance; + } + + #endregion + #region Public Methods /// @@ -95,7 +111,7 @@ namespace Tango.PPC.Common.MachineSetup } //Connect to machine service and get matching packages for this machine. - UpdateProgress("Downloading software package", "Connecting to machine service..."); + UpdateProgress("Validating serial number", "Connecting to machine service..."); LogManager.Log($"Connecting to machine service on {machineServiceAddress}..."); @@ -118,6 +134,10 @@ namespace Tango.PPC.Common.MachineSetup LogManager.Log($"Machine setup response received: {Environment.NewLine}{setup_response.ToJsonString()}"); + LogManager.Log("Installing remote assistance..."); + UpdateProgress("Installing remote assistance", "Installing..."); + await _remoteAssistance.InstallRemoteAssistance(); + //Create temporary folders for packages. var _newPackageTempFolder = TemporaryManager.CreateFolder(); _newPackageTempFolder.Persist = true; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs index 53596544a..1a0eea2bd 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -17,6 +18,7 @@ namespace Tango.PPC.Common.RemoteAssistance public class DefaultRemoteAssistanceProvider : ExtendedObject, IRemoteAssistanceProvider { private IMachineProvider _machineProvider; + private String _installer_path = "C:\\Program Files(x86)\\TeamViewer\\TeamViewer_Host.msi"; private bool _isEnabled; /// @@ -95,14 +97,18 @@ namespace Tango.PPC.Common.RemoteAssistance /// /// Installs the remote assistance. /// - /// Name of the group. - /// Name of the computer. + /// The machine serial number. /// - public async Task InstallRemoteAssistance(string groupName, string computerName) + public async Task InstallRemoteAssistance(String machineSerialNumber) { try { - CmdCommand command = new CmdCommand("msiexec.exe", $"/i \"C:\\Program Files(x86)\\TeamViewer\\TeamViewer_Host.msi\" /qn CUSTOMCONFIGID=ke43ann APITOKEN=4765529-gon1LwO1N1TTrlLI21ji ASSIGNMENTOPTIONS=\" --reassign --alias {"TANGO-" + _machineProvider.Machine.SerialNumber} --grant-easy-access\""); + if (!File.Exists(_installer_path)) + { + throw new FileNotFoundException($"The remote assistance installer file could not be found at {_installer_path}."); + } + + CmdCommand command = new CmdCommand("msiexec.exe", $"/i \"{_installer_path}\" /qn CUSTOMCONFIGID=ke43ann APITOKEN=4765529-gon1LwO1N1TTrlLI21ji ASSIGNMENTOPTIONS=\" --reassign --alias {"TANGO-" + machineSerialNumber} --grant-easy-access\""); await command.Run(); } catch (Exception ex) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs index 288b5c652..cafb8dab9 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs @@ -31,9 +31,8 @@ namespace Tango.PPC.Common.RemoteAssistance /// /// Installs the remote assistance. /// - /// Name of the group. - /// Name of the computer. + /// The machine serial number. /// - Task InstallRemoteAssistance(String groupName, String computerName); + Task InstallRemoteAssistance(String machineSerialNumber); } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 645456216..81c76b51c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -77,12 +77,12 @@ namespace Tango.PPC.UI TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); + TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); //TangoIOC.Default.Register(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa")); -- cgit v1.3.1