1 files changed, 0 insertions, 111 deletions
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
index 468af8043..30f28f9f4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
@@ -6,15 +6,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Enumerations;
-using Tango.BL.ValueObjects;
-using Tango.PMR.Exports;
 
 namespace Tango.BL.Entities
 {
     public partial class JobRun : JobRunBase
     {
-        private List<JobRunLiquidQuantity> _liquidQuantities;
-
         [NotMapped]
         [JsonIgnore]
         public JobRunStatus JobRunStatus
@@ -23,113 +19,6 @@ namespace Tango.BL.Entities
             set { Status = (int)value; }
         }
 
-        /// <summary>
-        /// Gets or sets the job designation.
-        /// </summary>
-        [NotMapped]
-        [JsonIgnore]
-        public JobDesignations Designation
-        {
-            get { return (JobDesignations)JobDesignation; }
-            set { JobDesignation = value.ToInt32(); RaisePropertyChangedAuto(); }
-        }
-
-        /// <summary>
-        /// Gets or sets the job designation.
-        /// </summary>
-        [NotMapped]
-        [JsonIgnore]
-        public JobSource Source
-        {
-            get { return (JobSource)JobSource; }
-            set { JobSource = value.ToInt32(); RaisePropertyChangedAuto(); }
-        }
-
-        [NotMapped]
-        [JsonIgnore]
-        public List<JobRunLiquidQuantity> LiquidQuantities
-        {
-            get
-            {
-                if (_liquidQuantities == null)
-                {
-                    if (LiquidQuantityString != null)
-                    {
-                        try
-                        {
-                            _liquidQuantities = JsonConvert.DeserializeObject<List<JobRunLiquidQuantity>>(LiquidQuantityString);
-                        }
-                        catch
-                        {
-                            _liquidQuantities = new List<JobRunLiquidQuantity>();
-                        }
-                    }
-                    else
-                    {
-                        _liquidQuantities = new List<JobRunLiquidQuantity>();
-                    }
-                }
-
-                return _liquidQuantities;
-            }
-            set
-            {
-                _liquidQuantities = value;
-
-                if (_liquidQuantities != null)
-                {
-                    LiquidQuantityString = JsonConvert.SerializeObject(_liquidQuantities);
-                }
-            }
-        }
-
-
-        private List<JobRunLiquidQuantity> _liquidQuantitiesFast;
-        [NotMapped]
-        [JsonIgnore]
-        public List<JobRunLiquidQuantity> LiquidQuantitiesFast
-        {
-            get
-            {
-                if (_liquidQuantitiesFast == null)
-                {
-                    _liquidQuantitiesFast = new List<JobRunLiquidQuantity>();
-
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Cyan, Quantity = CyanQuantity });
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Magenta, Quantity = MagentaQuantity });
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Yellow, Quantity = YellowQuantity });
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Black, Quantity = BlackQuantity });
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.TransparentInk, Quantity = TransparentQuantity });
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Lubricant, Quantity = LubricantQuantity });
-                    _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Cleaner, Quantity = CleanerQuantity });
-                }
-
-                return _liquidQuantitiesFast;
-            }
-        }
-
-        private JobFile _jobFile;
-        [NotMapped]
-        [JsonIgnore]
-        public JobFile JobFile
-        {
-            get
-            {
-                if (_jobFile == null && JobString != null)
-                {
-                    _jobFile = JobFile.Parser.ParseJson(JobString);
-                }
-
-                return _jobFile;
-            }
-            set { _jobFile = value; }
-        }
-
-        public Task<Job> CreateAssociatedJob()
-        {
-            return Job.FromJobFile(JobFile, MachineGuid, UserGuid);
-        }
-
         protected override void RaisePropertyChanged(string propName)
         {
             base.RaisePropertyChanged(propName);