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

2 files changed, 5 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index c41a9ef5d..164867afe 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -518,7 +518,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 job.ColorSpaceGuid = Adapter.ColorSpaces.FirstOrDefault(x => x.Code == vm.SelectedColorSpace.ToInt32()).Guid;
                 job.ColorSpace = _colorSpaces.SingleOrDefault(x => x.Guid == job.ColorSpaceGuid);
                 job.MachineGuid = MachineProvider.Machine.Guid;
-                job.UserGuid = AuthenticationProvider.CurrentUser.Guid;
+                job.UserGuid = null;
                 job.RmlGuid = Settings.DefaultRmlGuid != null ? Settings.DefaultRmlGuid : _rmls.FirstOrDefault().Guid;
                 job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid;
                 job.SpoolTypeGuid = Settings.DefaultSpoolTypeGuid != null ? Settings.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
@@ -843,7 +843,7 @@ namespace Tango.PPC.Jobs.ViewModels
                         try
                         {
                             JobFile jFile = JobFile.Parser.ParseFrom(File.ReadAllBytes(jobFile.Path));
-                            var job = await Job.FromJobFile(jFile, MachineProvider.Machine.Guid, AuthenticationProvider.CurrentUser.Guid);
+                            var job = await Job.FromJobFile(jFile, MachineProvider.Machine.Guid, null);
                             job.JobSource = JobSource.Local;
                             jobContext.Jobs.Add(job);
                             await jobContext.SaveChangesAsync();
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
index 7869e6990..daf27e62e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
@@ -82,9 +82,11 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <param name="e">The <see cref="Integration.Operation.PrintingFailedEventArgs"/> instance containing the event data.</param>
         private void MachineOperator_PrintingFailed(object sender, PrintingFailedEventArgs e)
         {
+            String message = $"{e.Exception.FlattenMessage()}\nTap to view this job details.";
+
             _last_failed_job_notification = NotificationProvider.PushNotification(new MessageNotificationItem(
                 $"'{e.Job.Name}' failed at position {e.JobHandler.Status.ProgressMinusSettingUp.ToString("0.0")} out of {e.JobHandler.Status.TotalProgressMinusSettingUp.ToString("0.0")} meters.",
-                String.Format("The job '{1}' has failed due to unexpected error.{0}{2}{0}{0}Tap to view this job details.", Environment.NewLine, e.Job.Name, e.Exception), MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
+                message, MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
                  {
                      NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
                      NavigationManager.ClearHistoryExcept<JobsView>();