Job Resume Manager.

14 files changed, 189 insertions, 60 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
index 5ec7c3f39..96083d842 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
@@ -352,8 +352,6 @@
       <DependentUpon>ColorCorrectionReport.xaml</DependentUpon>
     </Compile>
     <Compile Include="Reports\ColorCorrectionRepotVM.cs" />
-    <Compile Include="Resume\JobResumeDB.cs" />
-    <Compile Include="Resume\JobResumeModel.cs" />
     <Compile Include="UndoRedoCommands\AddBrushStopCommand.cs" />
     <Compile Include="UndoRedoCommands\AddNewSegmentCommand.cs" />
     <Compile Include="UndoRedoCommands\ChangeLengthCommand.cs" />
@@ -757,7 +755,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index 9d8ae1555..123151fcf 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -46,8 +46,8 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Tango.PPC.Jobs.ColorCorrectionTool;
 using Tango.PPC.Common.Printing;
-using Tango.PPC.Jobs.Resume;
 using Tango.Core.ExtensionMethods;
+using Tango.PPC.Common.Resume;
 
 namespace Tango.PPC.Jobs.ViewModels
 {
@@ -509,7 +509,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
                     try
                     {
-                        ResumeModel = JobResumeDB.Default.Get(Job.Guid);
+                        ResumeModel = JobResumeManager.GetJobResumeModel(Job.Guid);
 
                         if (ResumeModel != null)
                         {
@@ -1326,6 +1326,9 @@ namespace Tango.PPC.Jobs.ViewModels
 
             MachineProvider.MachineOperator.PrintingEnded += MachineOperator_PrintingEnded;
             MachineProvider.MachineOperator.PrintingStarted += MachineOperator_PrintingStarted;
+
+            JobResumeManager.JobResumeUpdated += JobResumeManager_JobResumeUpdated;
+            JobResumeManager.JobResumeDropped += JobResumeManager_JobResumeDropped;
         }
 
         /// <summary>
@@ -1793,11 +1796,6 @@ namespace Tango.PPC.Jobs.ViewModels
             }
 
             RaisePropertyChanged(nameof(CanEdit));
-
-            if (BuildProvider.IsEureka)
-            {
-                UpdateJobResume(e);
-            }
         }
 
 
@@ -1805,54 +1803,19 @@ namespace Tango.PPC.Jobs.ViewModels
 
         #region Resume
 
-        private void UpdateJobResume(PrintingEventArgs e)
+        private void JobResumeManager_JobResumeUpdated(object sender, Common.Resume.JobResumeUpdatedEventArgs e)
         {
-            try
+            if (Job.Guid == e.JobGuid)
             {
-                if (!e.JobHandler.Status.IsCompleted)
-                {
-                    if (e.JobHandler.JobStatus.Progress <= e.JobHandler.ProcessParameters.DryerBufferLengthMeters) return;
-
-                    var model = JobResumeDB.Default.Get(e.Job.Guid);
-                    bool insert = false;
-                    if (model == null)
-                    {
-                        model = new JobResumeModel();
-                        insert = true;
-                    }
-
-                    model.JobGuid = e.Job.Guid;
-                    model.FirstUnitStartPosition = e.JobHandler.Status.CurrentUnitProgress;
-                    model.RemainingUnits = e.JobHandler.Status.RemainingUnits;
-                    model.GlobalStartPosition = e.JobHandler.JobStatus.Progress;
-
-                    if (insert)
-                    {
-                        JobResumeDB.Default.Add(model);
-                    }
-                    else
-                    {
-                        JobResumeDB.Default.Update(model);
-                    }
-
-                    if (Job.Guid == e.Job.Guid)
-                    {
-                        ResumeModel = model;
-                    }
-                }
-                else
-                {
-                    JobResumeDB.Default.Delete(e.Job.Guid);
-
-                    if (Job.Guid == e.Job.Guid)
-                    {
-                        ResumeModel = null;
-                    }
-                }
+                ResumeModel = e.ResumeModel;
             }
-            catch (Exception ex)
+        }
+
+        private void JobResumeManager_JobResumeDropped(object sender, Common.Resume.JobResumeDroppedEventArgs e)
+        {
+            if (Job.Guid == e.JobGuid)
             {
-                LogManager.Log(ex, "Error inserting/updating job resume info on db.");
+                ResumeModel = null;
             }
         }
 
@@ -1862,8 +1825,7 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 if (await NotificationProvider.ShowQuestion("Drop resume information and enable job editing?"))
                 {
-                    JobResumeDB.Default.Delete(Job.Guid);
-                    ResumeModel = null;
+                    JobResumeManager.DropResume(Job.Guid);
                 }
             }
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
index b54289813..7064a48e1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
@@ -20,6 +20,7 @@ using Tango.PPC.Common.Printing;
 using Tango.PPC.Common.RemoteAssistance;
 using Tango.PPC.Common.RemoteDesktop;
 using Tango.PPC.Common.RemoteJobUpload;
+using Tango.PPC.Common.Resume;
 using Tango.PPC.Common.Storage;
 using Tango.PPC.Common.Synchronization;
 using Tango.PPC.Common.ThreadLoading;
@@ -145,6 +146,9 @@ namespace Tango.PPC.Common
         [TangoInject]
         public IBuildProvider BuildProvider { get; set; }
 
+        [TangoInject]
+        public IJobResumeManager JobResumeManager { get; set; }
+
         private PPCSettings _settings;
         /// <summary>
         /// Gets the main PPC settings.
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/DefaultJobResumeManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/DefaultJobResumeManager.cs
new file mode 100644
index 000000000..5f819d34d
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/DefaultJobResumeManager.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Core.DI;
+using Tango.Integration.Operation;
+using Tango.PPC.Common.Build;
+using Tango.PPC.Common.Connection;
+
+namespace Tango.PPC.Common.Resume
+{
+    public class DefaultJobResumeManager : ExtendedObject, IJobResumeManager
+    {
+        private IMachineProvider _machineProvider;
+        private IBuildProvider _buildProvider;
+
+        public event EventHandler<JobResumeUpdatedEventArgs> JobResumeUpdated;
+        public event EventHandler<JobResumeDroppedEventArgs> JobResumeDropped;
+
+        [TangoInject]
+        public DefaultJobResumeManager(IMachineProvider machineProvider,IBuildProvider buildProvider)
+        {
+            _machineProvider = machineProvider;
+            _buildProvider = buildProvider;
+            machineProvider.MachineOperator.PrintingEnded += MachineOperator_PrintingEnded;
+        }
+
+        private void MachineOperator_PrintingEnded(object sender, PrintingEventArgs e)
+        {
+            if (_buildProvider.IsEureka)
+            {
+                UpdateJobResume(e);
+            }
+        }
+
+        private void UpdateJobResume(PrintingEventArgs e)
+        {
+            try
+            {
+                if (!e.JobHandler.Status.IsCompleted)
+                {
+                    if (e.JobHandler.JobStatus.Progress <= e.JobHandler.ProcessParameters.DryerBufferLengthMeters) return;
+
+                    var model = JobResumeDB.Default.Get(e.Job.Guid);
+                    bool insert = false;
+                    if (model == null)
+                    {
+                        model = new JobResumeModel();
+                        insert = true;
+                    }
+
+                    model.JobGuid = e.Job.Guid;
+                    model.FirstUnitStartPosition = e.JobHandler.Status.CurrentUnitProgress;
+                    model.RemainingUnits = e.JobHandler.Status.RemainingUnits;
+                    model.GlobalStartPosition = e.JobHandler.JobStatus.Progress;
+
+                    if (insert)
+                    {
+                        JobResumeDB.Default.Add(model);
+                    }
+                    else
+                    {
+                        JobResumeDB.Default.Update(model);
+                    }
+
+                    JobResumeUpdated?.Invoke(this, new JobResumeUpdatedEventArgs()
+                    {
+                        JobGuid = e.Job.Guid,
+                        ResumeModel = model
+                    });
+                }
+                else
+                {
+                    JobResumeDB.Default.Delete(e.Job.Guid);
+
+                    JobResumeUpdated?.Invoke(this, new JobResumeUpdatedEventArgs()
+                    {
+                        JobGuid = e.Job.Guid,
+                        ResumeModel = null
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error inserting/updating job resume info on db.");
+            }
+        }
+
+        public JobResumeModel GetJobResumeModel(string jobGuid)
+        {
+            return JobResumeDB.Default.Get(jobGuid);
+        }
+
+        public void DropResume(string jobGuid)
+        {
+            JobResumeDB.Default.Delete(jobGuid);
+
+            JobResumeDropped?.Invoke(this, new JobResumeDroppedEventArgs() { JobGuid = jobGuid });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/IJobResumeManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/IJobResumeManager.cs
new file mode 100644
index 000000000..002563fc4
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/IJobResumeManager.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Operation;
+
+namespace Tango.PPC.Common.Resume
+{
+    public interface IJobResumeManager
+    {
+        event EventHandler<JobResumeUpdatedEventArgs> JobResumeUpdated;
+
+        event EventHandler<JobResumeDroppedEventArgs> JobResumeDropped;
+
+        void DropResume(String jobGuid);
+
+        JobResumeModel GetJobResumeModel(String jobGuid);
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Resume/JobResumeDB.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeDB.cs
index 28184eee1..904e37b2e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Resume/JobResumeDB.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeDB.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.PPC.Jobs.Resume
+namespace Tango.PPC.Common.Resume
 {
     public class JobResumeDB : IDisposable
     {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeDroppedEventArgs.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeDroppedEventArgs.cs
new file mode 100644
index 000000000..674087063
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeDroppedEventArgs.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Common.Resume
+{
+    public class JobResumeDroppedEventArgs : EventArgs
+    {
+        public String JobGuid { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Resume/JobResumeModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeModel.cs
index 4ded7e313..40386566e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Resume/JobResumeModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeModel.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.PPC.Jobs.Resume
+namespace Tango.PPC.Common.Resume
 {
     public class JobResumeModel
     {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeUpdatedEventArgs.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeUpdatedEventArgs.cs
new file mode 100644
index 000000000..037654370
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resume/JobResumeUpdatedEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Common.Resume
+{
+    public class JobResumeUpdatedEventArgs : EventArgs
+    {
+        public JobResumeModel ResumeModel { get; set; }
+
+        public String JobGuid { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index e598c6fe4..28cbfa6bc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -88,6 +88,9 @@
     <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
     </Reference>
+    <Reference Include="LiteDB, Version=5.0.4.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\LiteDB.5.0.4\lib\net45\LiteDB.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.SqlServer.AzureStorageEnum, Version=14.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
@@ -121,6 +124,7 @@
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
@@ -221,6 +225,12 @@
     <Compile Include="RemoteActions\IRemoteActionsService.cs" />
     <Compile Include="RemoteNotifications\DefaultRemoteNotificationsService.cs" />
     <Compile Include="RemoteNotifications\IRemoteNotificationsService.cs" />
+    <Compile Include="Resume\DefaultJobResumeManager.cs" />
+    <Compile Include="Resume\IJobResumeManager.cs" />
+    <Compile Include="Resume\JobResumeDB.cs" />
+    <Compile Include="Resume\JobResumeDroppedEventArgs.cs" />
+    <Compile Include="Resume\JobResumeModel.cs" />
+    <Compile Include="Resume\JobResumeUpdatedEventArgs.cs" />
     <Compile Include="SQL\DefaultRemoteSqlService.cs" />
     <Compile Include="SQL\IRemoteSqlService.cs" />
     <Compile Include="Statistics\DefaultStatisticsService.cs" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/packages.config b/Software/Visual_Studio/PPC/Tango.PPC.Common/packages.config
index adc33d349..cba40d441 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/packages.config
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/packages.config
@@ -6,6 +6,7 @@
   <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net46" />
   <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" />
   <package id="Ionic.Zip" version="1.9.1.8" targetFramework="net461" />
+  <package id="LiteDB" version="5.0.4" targetFramework="net461" />
   <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
   <package id="System.Data.SQLite" version="1.0.108.0" targetFramework="net46" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 705c042c5..a0fba3632 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -991,7 +991,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir)
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets" Condition="Exists('..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets')" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index 251eeb1ec..24921a5ea 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -33,6 +33,7 @@ using Tango.PPC.Common.RemoteDesktop;
 using Tango.PPC.Common.RemoteJob;
 using Tango.PPC.Common.RemoteJobUpload;
 using Tango.PPC.Common.RemoteNotifications;
+using Tango.PPC.Common.Resume;
 using Tango.PPC.Common.SQL;
 using Tango.PPC.Common.Statistics;
 using Tango.PPC.Common.Storage;
@@ -114,6 +115,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<IRemoteNotificationsService>();
             TangoIOC.Default.Unregister<IRemoteJobUploadService>();
             TangoIOC.Default.Unregister<IStatisticsService>();
+            TangoIOC.Default.Unregister<IJobResumeManager>();
 
             if (App.StartupArgs != null && App.StartupArgs.Contains("-webDebug"))
             {
@@ -169,6 +171,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<IRemoteNotificationsService, DefaultRemoteNotificationsService>();
             TangoIOC.Default.Register<IRemoteJobUploadService, DefaultRemoteJobUploadService>();
             TangoIOC.Default.Register<IStatisticsService, DefaultStatisticsService>();
+            TangoIOC.Default.Register<IJobResumeManager, DefaultJobResumeManager>();
 
             TangoIOC.Default.Register<LoadingViewVM>();
             TangoIOC.Default.Register<MainViewVM>();
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>