X1 Startup

5 files changed, 50 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
index 4aae63562..73be1c9d8 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
@@ -169,6 +169,16 @@ namespace Tango.BL.Entities
             }
         }
 
+        [NotMapped]
+        [JsonIgnore]
+        public MachineTypes MachineTypeEnum
+        {
+            get
+            {
+                return (MachineTypes)MachineType;
+            }
+        }
+
 
         /// <summary>
         /// Initializes a new instance of the <see cref="JobRun" /> class.
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
index 694ee1f37..501dc7fd9 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
@@ -26,7 +26,10 @@ namespace Tango.BL.Entities
         [JsonIgnore]
         public MachineTypes MachineType
         {
-            get { return Version == 1 ? MachineTypes.TS1800 : MachineTypes.Eureka; }
+            get
+            {
+                return (MachineTypes)(Version + 1);
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs
index 381b87cbc..1684d14d2 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs
@@ -7,11 +7,26 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.Enumerations
 {
+    public class MachineTypeAttribute : Attribute
+    {
+        public String ShortName { get; set; }
+
+        public MachineTypeAttribute(String shortName)
+        {
+            ShortName = shortName;
+        }
+    }
+
     public enum MachineTypes
     {
+        [MachineType("TS")]
         [Description("TS-1800")]
         TS1800 = 0,
+        [MachineType("X4")]
         [Description("Twine X4")]
         Eureka = 1,
+        [MachineType("X1")]
+        [Description("Twine X1")]
+        X1 = 2,
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ExtensionMethods/MachineTypesExtensions.cs b/Software/Visual_Studio/Tango.BL/ExtensionMethods/MachineTypesExtensions.cs
new file mode 100644
index 000000000..d8b5b519d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/ExtensionMethods/MachineTypesExtensions.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Enumerations;
+
+public static class MachineTypesExtensions
+{
+    public static bool IsXMachine(this MachineTypes machineType)
+    {
+        return machineType != MachineTypes.TS1800;
+    }
+
+    public static String ToShortName(this MachineTypes machineType)
+    {
+        return machineType.GetAttribute<MachineTypeAttribute>().ShortName;
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index dabc0455e..042105f11 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -604,6 +604,7 @@
     <Compile Include="Enumerations\YarnUnits.cs" />
     <Compile Include="ExtensionMethods\ColorCatalogItemsExtensions.cs" />
     <Compile Include="ExtensionMethods\ColorMineExtensions.cs" />
+    <Compile Include="ExtensionMethods\MachineTypesExtensions.cs" />
     <Compile Include="FineTuning\FineTuningTypes.cs" />
     <Compile Include="FineTuning\VectorFineTuningRunModel.cs" />
     <Compile Include="Helpers\EventTypeTextConverter.cs" />
@@ -837,7 +838,7 @@
   </Target>
   <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