aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-02-28 12:55:42 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-02-28 12:55:42 +0200
commitf0a14c671e8611feb3611e7a174fef02ae26632a (patch)
tree0c99f25fae7a034f610d5805d6e1fb11de086702 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
parent9f2a597f2404b3688f8bffb1ff67af6a3a119f18 (diff)
downloadTango-f0a14c671e8611feb3611e7a174fef02ae26632a.tar.gz
Tango-f0a14c671e8611feb3611e7a174fef02ae26632a.zip
Added clear cache custom action to machine studio installer maintenance.
Prevent save process parameters and save liquid factors with no researcher role. Fixed issue with brush stop offset meters refresh. Return back to dispensers list after saving dispenser. Fixed issue where brush stop offset sliders are not visible.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs9
1 files changed, 5 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 8ac8e6acd..35aca807c 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
@@ -65,7 +65,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
private DeveloperNavigationManager _navigation;
private INavigationManager _msNavigation;
private bool _blockInvalidateCommands;
- private IAuthenticationProvider _authentication;
private ObservablesContext _machineDbContext;
private ObservablesContext _activeJobDbContext;
private IEventLogger _eventLogger;
@@ -549,6 +548,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
set { _enableColorConversion = value; RaisePropertyChangedAuto(); }
}
+ public IAuthenticationProvider AuthenticationProvider { get; set; }
+
#endregion
#region Commands
@@ -707,7 +708,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
CanWork = true;
EnableColorConversion = true;
- _authentication = authentication;
+ AuthenticationProvider = authentication;
_notification = notificationProvider;
_speech = speech;
@@ -2052,7 +2053,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
Job newJob = new Job();
newJob.Name = jobName;
newJob.CreationDate = DateTime.UtcNow;
- newJob.UserGuid = _authentication.CurrentUser.Guid;
+ newJob.UserGuid = AuthenticationProvider.CurrentUser.Guid;
if (String.IsNullOrWhiteSpace(settings.DefaultJobRmlGuid))
{
@@ -2255,7 +2256,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
job.Name = jobName;
job.Name = jobName;
job.CreationDate = DateTime.UtcNow;
- job.UserGuid = _authentication.CurrentUser.Guid;
+ job.UserGuid = AuthenticationProvider.CurrentUser.Guid;
job.Rml = _machineDbContext.Rmls.FirstOrDefault();
job.WindingMethod = _machineDbContext.WindingMethods.FirstOrDefault();
job.SpoolType = _machineDbContext.SpoolTypes.FirstOrDefault();