merge

1 files changed, 2 insertions, 23 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
index 15c819d3a..fb591afa0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -17,34 +17,13 @@ namespace Tango.DAL.Remote.DB
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
-        public string MACHINE_GUID { get; set; }
         public string JOB_GUID { get; set; }
-        public string RML_GUID { get; set; }
-        public string USER_GUID { get; set; }
-        public string JOB_NAME { get; set; }
-        public int JOB_DESIGNATION { get; set; }
-        public int JOB_SOURCE { get; set; }
-        public string JOB_STRING { get; set; }
         public System.DateTime START_DATE { get; set; }
-        public Nullable<System.DateTime> UPLOADING_START_DATE { get; set; }
-        public Nullable<System.DateTime> HEATING_START_DATE { get; set; }
-        public Nullable<System.DateTime> ACTUAL_START_DATE { get; set; }
         public System.DateTime END_DATE { get; set; }
         public int STATUS { get; set; }
-        public double JOB_LENGTH { get; set; }
-        public bool IS_GRADIENT { get; set; }
-        public int GRADIENT_RESOLUTION_CM { get; set; }
-        public string LIQUID_QUANTITY_STRING { get; set; }
-        public int CYAN_QUANTITY { get; set; }
-        public int MAGENTA_QUANTITY { get; set; }
-        public int YELLOW_QUANTITY { get; set; }
-        public int BLACK_QUANTITY { get; set; }
-        public int TRANSPARENT_QUANTITY { get; set; }
-        public int LUBRICANT_QUANTITY { get; set; }
-        public int CLEANER_QUANTITY { get; set; }
         public double END_POSITION { get; set; }
         public string FAILED_MESSAGE { get; set; }
-        public bool IS_HEAD_CLEANING { get; set; }
-        public bool IS_SYNCHRONIZED { get; set; }
+    
+        public virtual JOB JOB { get; set; }
     }
 }