Implemented integration IJobRunsLogger.

Implemented DEBUG/RELEASE JsonController.
Implemented Local/Remote machine studio setting.

4 files changed, 13 insertions, 130 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/DefaultJobRunsLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/DefaultJobRunsLogger.cs
deleted file mode 100644
index b405a6729..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/DefaultJobRunsLogger.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL;
-using Tango.BL.Entities;
-using Tango.BL.Enumerations;
-using Tango.Core;
-using Tango.Core.DI;
-using Tango.Integration.ExternalBridge;
-using Tango.Integration.Operation;
-using Tango.MachineStudio.Common.StudioApplication;
-
-namespace Tango.MachineStudio.Common.JobRunsLogging
-{
-    public class DefaultJobRunsLogger : ExtendedObject, IJobRunsLogger
-    {
-        private ObservablesContext _context;
-        private DateTime _start_date;
-        private Job _job;
-        private IStudioApplicationManager applicationManager;
-
-        public void Init(IStudioApplicationManager appManager)
-        {
-            applicationManager = appManager;
-            _context = ObservablesContext.CreateDefault();
-            applicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
-        }
-
-        private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machine)
-        {
-            if (machine != null)
-            {
-                machine.PrintingStarted -= Machine_PrintingStarted;
-                machine.PrintingStarted += Machine_PrintingStarted;
-                machine.PrintingCompleted -= Machine_PrintingCompleted;
-                machine.PrintingCompleted += Machine_PrintingCompleted;
-                machine.PrintingAborted -= Machine_PrintingAborted;
-                machine.PrintingAborted += Machine_PrintingAborted;
-                machine.PrintingFailed -= Machine_PrintingFailed;
-                machine.PrintingFailed += Machine_PrintingFailed;
-            }
-        }
-
-        private void Machine_PrintingFailed(object sender, PrintingFailedEventArgs e)
-        {
-            if (e.Job.Guid == _job.Guid)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    _context.JobRuns.Add(new JobRun()
-                    {
-                        StartDate = _start_date,
-                        EndDate = DateTime.UtcNow,
-                        JobGuid = _job.Guid,
-                        JobRunStatus = JobRunStatus.Failed,
-                        EndPosition = e.JobHandler.Status.Progress,
-                        FailedMessage = e.Exception.Message,
-                    });
-
-                    _context.SaveChanges();
-                });
-            }
-        }
-
-        private void Machine_PrintingAborted(object sender, PrintingEventArgs e)
-        {
-            if (e.Job.Guid == _job.Guid)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    _context.JobRuns.Add(new JobRun()
-                    {
-                        StartDate = _start_date,
-                        EndDate = DateTime.UtcNow,
-                        JobGuid = _job.Guid,
-                        EndPosition = e.JobHandler.Status.Progress,
-                        JobRunStatus = JobRunStatus.Aborted,
-                    });
-
-                    _context.SaveChanges();
-                });
-            }
-        }
-
-        private void Machine_PrintingCompleted(object sender, PrintingEventArgs e)
-        {
-            if (e.Job.Guid == _job.Guid)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    _context.JobRuns.Add(new JobRun()
-                    {
-                        StartDate = _start_date,
-                        EndDate = DateTime.UtcNow,
-                        JobGuid = _job.Guid,
-                        EndPosition = e.JobHandler.Status.Progress,
-                        JobRunStatus = JobRunStatus.Completed,
-                    });
-
-                    _context.SaveChanges();
-                });
-            }
-        }
-
-        private void Machine_PrintingStarted(object sender, PrintingEventArgs e)
-        {
-            _job = e.Job;
-            _start_date = DateTime.UtcNow;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/IJobRunsLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/IJobRunsLogger.cs
deleted file mode 100644
index c3eca953b..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/IJobRunsLogger.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.MachineStudio.Common.StudioApplication;
-
-namespace Tango.MachineStudio.Common.JobRunsLogging
-{
-    public interface IJobRunsLogger
-    {
-        void Init(IStudioApplicationManager appManager);
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 1d3660c5f..2de954cbe 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -18,6 +18,12 @@ namespace Tango.MachineStudio.Common
             public WindowState State { get; set; }
         }
 
+        public enum WorkingEnvironment
+        {
+            Remote,
+            Local
+        }
+
         /// <summary>
         /// Gets or sets the last login email.
         /// </summary>
@@ -89,6 +95,11 @@ namespace Tango.MachineStudio.Common
         public String LastMainModuleName { get; set; }
 
         /// <summary>
+        /// Gets or sets the working environment.
+        /// </summary>
+        public WorkingEnvironment Environment { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachineStudio"/> class.
         /// </summary>
         public MachineStudioSettings()
@@ -98,6 +109,7 @@ namespace Tango.MachineStudio.Common
             MachineServiceAddress = "http://machineservice.twine-srv.com/";
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
+            Environment = WorkingEnvironment.Remote;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index cd99b00d0..85b194173 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -104,8 +104,6 @@
     <Compile Include="Html\IHtmlPresenter.cs" />
     <None Include="Helpers\GraphsHelper.cs" />
     <Compile Include="IStudioViewModel.cs" />
-    <Compile Include="JobRunsLogging\DefaultJobRunsLogger.cs" />
-    <Compile Include="JobRunsLogging\IJobRunsLogger.cs" />
     <Compile Include="MachineStudioSettings.cs" />
     <Compile Include="Messages\MachineConnectionChangedMessage.cs" />
     <Compile Include="Navigation\INavigationBlocker.cs" />
@@ -310,7 +308,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file