From cc425e019d3a7d3494ac15ffe213b6b47b1c64ed Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 15 Jul 2018 01:04:34 +0300 Subject: Working on PPC. --- .../Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs index f3d16e899..fa5f26c70 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs @@ -8,7 +8,6 @@ using Tango.Integration.Operation; using Tango.PPC.Common; using Tango.PPC.Common.Navigation; using Tango.PPC.Jobs.AppBarItems; -using Tango.PPC.Jobs.NotificationItems; using Tango.PPC.Jobs.Views; namespace Tango.PPC.Jobs.ViewModels @@ -38,26 +37,14 @@ namespace Tango.PPC.Jobs.ViewModels public override void OnApplicationStarted() { - MachineProvider.MachineOperator.PrintingStarted += PrintingStarted; + MachineProvider.MachineOperator.PrintingStarted += MachineOperator_PrintingStarted; } - private void PrintingStarted(object sender, JobHandler jobHandler) + private void MachineOperator_PrintingStarted(object sender, PrintingEventArgs e) { - Job = jobHandler.Job; - jobHandler.StatusChanged += JobHandler_StatusChanged; - jobHandler.Stopped += JobHandler_Stopped; - jobHandler.Completed += JobHandler_Completed; - } - - private void JobHandler_Completed(object sender, EventArgs e) - { - InvokeUI(() => - { - NotificationProvider.PushNotification().Pressed += (_, __) => - { - NavigationManager.NavigateTo(nameof(JobView)); - }; - }); + Job = e.Job; + e.JobHandler.StatusChanged += JobHandler_StatusChanged; + e.JobHandler.Stopped += JobHandler_Stopped; } public override void OnNavigatedFrom() -- cgit v1.3.1