merge

1 files changed, 24 insertions, 811 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index 58f429448..4d53a6d66 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -19,88 +19,29 @@ using System.Linq;
 using Tango.DAL.Remote.DB;
 using Tango.Core;
 using System.ComponentModel;
-using Tango.Core.CustomAttributes;
 
 namespace Tango.BL.Entities
 {
+
+    /// <summary>
+    /// 
+    /// </summary>
+
     [Table("JOB_RUNS")]
     public abstract class JobRunBase : ObservableEntity<JobRun>
     {
 
-        public event EventHandler<String> JobNameChanged;
-
-        public event EventHandler<Int32> JobDesignationChanged;
-
-        public event EventHandler<Int32> JobSourceChanged;
-
-        public event EventHandler<String> JobStringChanged;
-
         public event EventHandler<DateTime> StartDateChanged;
 
-        public event EventHandler<Nullable<DateTime>> UploadingStartDateChanged;
-
-        public event EventHandler<Nullable<DateTime>> HeatingStartDateChanged;
-
-        public event EventHandler<Nullable<DateTime>> ActualStartDateChanged;
-
         public event EventHandler<DateTime> EndDateChanged;
 
         public event EventHandler<Int32> StatusChanged;
 
-        public event EventHandler<Double> JobLengthChanged;
-
-        public event EventHandler<Boolean> IsGradientChanged;
-
-        public event EventHandler<Int32> GradientResolutionCmChanged;
-
-        public event EventHandler<String> LiquidQuantityStringChanged;
-
-        public event EventHandler<Int32> CyanQuantityChanged;
-
-        public event EventHandler<Int32> MagentaQuantityChanged;
-
-        public event EventHandler<Int32> YellowQuantityChanged;
-
-        public event EventHandler<Int32> BlackQuantityChanged;
-
-        public event EventHandler<Int32> TransparentQuantityChanged;
-
-        public event EventHandler<Int32> LubricantQuantityChanged;
-
-        public event EventHandler<Int32> CleanerQuantityChanged;
-
         public event EventHandler<Double> EndPositionChanged;
 
         public event EventHandler<String> FailedMessageChanged;
 
-        public event EventHandler<Boolean> IsHeadCleaningChanged;
-
-        public event EventHandler<Boolean> IsSynchronizedChanged;
-
-        protected String _machineguid;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase machine guid.
-        /// </summary>
-
-        [Column("MACHINE_GUID")]
-
-        public  String MachineGuid
-        {
-            get 
-            {
-                return _machineguid; 
-            }
-
-            set 
-            {
-                if (_machineguid != value)
-                {
-                    _machineguid = value;
-
-                }
-            }
-        }
+        public event EventHandler<Job> JobChanged;
 
         protected String _jobguid;
 
@@ -109,6 +50,7 @@ namespace Tango.BL.Entities
         /// </summary>
 
         [Column("JOB_GUID")]
+        [ForeignKey("Job")]
 
         public  String JobGuid
         {
@@ -127,164 +69,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected String _rmlguid;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase rml guid.
-        /// </summary>
-
-        [Column("RML_GUID")]
-
-        public  String RmlGuid
-        {
-            get 
-            {
-                return _rmlguid; 
-            }
-
-            set 
-            {
-                if (_rmlguid != value)
-                {
-                    _rmlguid = value;
-
-                }
-            }
-        }
-
-        protected String _userguid;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase user guid.
-        /// </summary>
-
-        [Column("USER_GUID")]
-
-        public  String UserGuid
-        {
-            get 
-            {
-                return _userguid; 
-            }
-
-            set 
-            {
-                if (_userguid != value)
-                {
-                    _userguid = value;
-
-                }
-            }
-        }
-
-        protected String _jobname;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase job name.
-        /// </summary>
-
-        [Column("JOB_NAME")]
-
-        public  String JobName
-        {
-            get 
-            {
-                return _jobname; 
-            }
-
-            set 
-            {
-                if (_jobname != value)
-                {
-                    _jobname = value;
-
-                    OnJobNameChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _jobdesignation;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase job designation.
-        /// </summary>
-
-        [Column("JOB_DESIGNATION")]
-
-        public  Int32 JobDesignation
-        {
-            get 
-            {
-                return _jobdesignation; 
-            }
-
-            set 
-            {
-                if (_jobdesignation != value)
-                {
-                    _jobdesignation = value;
-
-                    OnJobDesignationChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _jobsource;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase job source.
-        /// </summary>
-
-        [Column("JOB_SOURCE")]
-
-        public  Int32 JobSource
-        {
-            get 
-            {
-                return _jobsource; 
-            }
-
-            set 
-            {
-                if (_jobsource != value)
-                {
-                    _jobsource = value;
-
-                    OnJobSourceChanged(value);
-
-                }
-            }
-        }
-
-        protected String _jobstring;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase job string.
-        /// </summary>
-
-        [Column("JOB_STRING")]
-
-        public  String JobString
-        {
-            get 
-            {
-                return _jobstring; 
-            }
-
-            set 
-            {
-                if (_jobstring != value)
-                {
-                    _jobstring = value;
-
-                    OnJobStringChanged(value);
-
-                }
-            }
-        }
-
         protected DateTime _startdate;
 
         /// <summary>
@@ -312,87 +96,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<DateTime> _uploadingstartdate;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase uploading start date.
-        /// </summary>
-
-        [Column("UPLOADING_START_DATE")]
-
-        public  Nullable<DateTime> UploadingStartDate
-        {
-            get 
-            {
-                return _uploadingstartdate; 
-            }
-
-            set 
-            {
-                if (_uploadingstartdate != value)
-                {
-                    _uploadingstartdate = value;
-
-                    OnUploadingStartDateChanged(value);
-
-                }
-            }
-        }
-
-        protected Nullable<DateTime> _heatingstartdate;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase heating start date.
-        /// </summary>
-
-        [Column("HEATING_START_DATE")]
-
-        public  Nullable<DateTime> HeatingStartDate
-        {
-            get 
-            {
-                return _heatingstartdate; 
-            }
-
-            set 
-            {
-                if (_heatingstartdate != value)
-                {
-                    _heatingstartdate = value;
-
-                    OnHeatingStartDateChanged(value);
-
-                }
-            }
-        }
-
-        protected Nullable<DateTime> _actualstartdate;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase actual start date.
-        /// </summary>
-
-        [Column("ACTUAL_START_DATE")]
-
-        public  Nullable<DateTime> ActualStartDate
-        {
-            get 
-            {
-                return _actualstartdate; 
-            }
-
-            set 
-            {
-                if (_actualstartdate != value)
-                {
-                    _actualstartdate = value;
-
-                    OnActualStartDateChanged(value);
-
-                }
-            }
-        }
-
         protected DateTime _enddate;
 
         /// <summary>
@@ -449,303 +152,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Double _joblength;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase job length.
-        /// </summary>
-
-        [Column("JOB_LENGTH")]
-
-        public  Double JobLength
-        {
-            get 
-            {
-                return _joblength; 
-            }
-
-            set 
-            {
-                if (_joblength != value)
-                {
-                    _joblength = value;
-
-                    OnJobLengthChanged(value);
-
-                }
-            }
-        }
-
-        protected Boolean _isgradient;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase is gradient.
-        /// </summary>
-
-        [Column("IS_GRADIENT")]
-
-        public  Boolean IsGradient
-        {
-            get 
-            {
-                return _isgradient; 
-            }
-
-            set 
-            {
-                if (_isgradient != value)
-                {
-                    _isgradient = value;
-
-                    OnIsGradientChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _gradientresolutioncm;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase gradient resolution cm.
-        /// </summary>
-
-        [Column("GRADIENT_RESOLUTION_CM")]
-
-        public  Int32 GradientResolutionCm
-        {
-            get 
-            {
-                return _gradientresolutioncm; 
-            }
-
-            set 
-            {
-                if (_gradientresolutioncm != value)
-                {
-                    _gradientresolutioncm = value;
-
-                    OnGradientResolutionCmChanged(value);
-
-                }
-            }
-        }
-
-        protected String _liquidquantitystring;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase liquid quantity string.
-        /// </summary>
-
-        [Column("LIQUID_QUANTITY_STRING")]
-
-        public  String LiquidQuantityString
-        {
-            get 
-            {
-                return _liquidquantitystring; 
-            }
-
-            set 
-            {
-                if (_liquidquantitystring != value)
-                {
-                    _liquidquantitystring = value;
-
-                    OnLiquidQuantityStringChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _cyanquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase cyan quantity.
-        /// </summary>
-
-        [Column("CYAN_QUANTITY")]
-
-        public  Int32 CyanQuantity
-        {
-            get 
-            {
-                return _cyanquantity; 
-            }
-
-            set 
-            {
-                if (_cyanquantity != value)
-                {
-                    _cyanquantity = value;
-
-                    OnCyanQuantityChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _magentaquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase magenta quantity.
-        /// </summary>
-
-        [Column("MAGENTA_QUANTITY")]
-
-        public  Int32 MagentaQuantity
-        {
-            get 
-            {
-                return _magentaquantity; 
-            }
-
-            set 
-            {
-                if (_magentaquantity != value)
-                {
-                    _magentaquantity = value;
-
-                    OnMagentaQuantityChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _yellowquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase yellow quantity.
-        /// </summary>
-
-        [Column("YELLOW_QUANTITY")]
-
-        public  Int32 YellowQuantity
-        {
-            get 
-            {
-                return _yellowquantity; 
-            }
-
-            set 
-            {
-                if (_yellowquantity != value)
-                {
-                    _yellowquantity = value;
-
-                    OnYellowQuantityChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _blackquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase black quantity.
-        /// </summary>
-
-        [Column("BLACK_QUANTITY")]
-
-        public  Int32 BlackQuantity
-        {
-            get 
-            {
-                return _blackquantity; 
-            }
-
-            set 
-            {
-                if (_blackquantity != value)
-                {
-                    _blackquantity = value;
-
-                    OnBlackQuantityChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _transparentquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase transparent quantity.
-        /// </summary>
-
-        [Column("TRANSPARENT_QUANTITY")]
-
-        public  Int32 TransparentQuantity
-        {
-            get 
-            {
-                return _transparentquantity; 
-            }
-
-            set 
-            {
-                if (_transparentquantity != value)
-                {
-                    _transparentquantity = value;
-
-                    OnTransparentQuantityChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _lubricantquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase lubricant quantity.
-        /// </summary>
-
-        [Column("LUBRICANT_QUANTITY")]
-
-        public  Int32 LubricantQuantity
-        {
-            get 
-            {
-                return _lubricantquantity; 
-            }
-
-            set 
-            {
-                if (_lubricantquantity != value)
-                {
-                    _lubricantquantity = value;
-
-                    OnLubricantQuantityChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _cleanerquantity;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase cleaner quantity.
-        /// </summary>
-
-        [Column("CLEANER_QUANTITY")]
-
-        public  Int32 CleanerQuantity
-        {
-            get 
-            {
-                return _cleanerquantity; 
-            }
-
-            set 
-            {
-                if (_cleanerquantity != value)
-                {
-                    _cleanerquantity = value;
-
-                    OnCleanerQuantityChanged(value);
-
-                }
-            }
-        }
-
         protected Double _endposition;
 
         /// <summary>
@@ -800,97 +206,39 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Boolean _isheadcleaning;
+        protected Job _job;
 
         /// <summary>
-        /// Gets or sets the jobrunbase is head cleaning.
+        /// Gets or sets the jobrunbase job.
         /// </summary>
 
-        [Column("IS_HEAD_CLEANING")]
-
-        public  Boolean IsHeadCleaning
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Job Job
         {
             get 
             {
-                return _isheadcleaning; 
+                return _job; 
             }
 
             set 
             {
-                if (_isheadcleaning != value)
+                if (_job != value)
                 {
-                    _isheadcleaning = value;
-
-                    OnIsHeadCleaningChanged(value);
-
-                }
-            }
-        }
-
-        protected Boolean _issynchronized;
-
-        /// <summary>
-        /// Gets or sets the jobrunbase is synchronized.
-        /// </summary>
-
-        [Column("IS_SYNCHRONIZED")]
-
-        public  Boolean IsSynchronized
-        {
-            get 
-            {
-                return _issynchronized; 
-            }
+                    _job = value;
 
-            set 
-            {
-                if (_issynchronized != value)
-                {
-                    _issynchronized = value;
+                    if (Job != null)
+                    {
+                        JobGuid = Job.Guid;
+                    }
 
-                    OnIsSynchronizedChanged(value);
+                    OnJobChanged(value);
 
                 }
             }
         }
 
         /// <summary>
-        /// Called when the JobName has changed.
-        /// </summary>
-        protected virtual void OnJobNameChanged(String jobname)
-        {
-            JobNameChanged?.Invoke(this, jobname);
-            RaisePropertyChanged(nameof(JobName));
-        }
-
-        /// <summary>
-        /// Called when the JobDesignation has changed.
-        /// </summary>
-        protected virtual void OnJobDesignationChanged(Int32 jobdesignation)
-        {
-            JobDesignationChanged?.Invoke(this, jobdesignation);
-            RaisePropertyChanged(nameof(JobDesignation));
-        }
-
-        /// <summary>
-        /// Called when the JobSource has changed.
-        /// </summary>
-        protected virtual void OnJobSourceChanged(Int32 jobsource)
-        {
-            JobSourceChanged?.Invoke(this, jobsource);
-            RaisePropertyChanged(nameof(JobSource));
-        }
-
-        /// <summary>
-        /// Called when the JobString has changed.
-        /// </summary>
-        protected virtual void OnJobStringChanged(String jobstring)
-        {
-            JobStringChanged?.Invoke(this, jobstring);
-            RaisePropertyChanged(nameof(JobString));
-        }
-
-        /// <summary>
         /// Called when the StartDate has changed.
         /// </summary>
         protected virtual void OnStartDateChanged(DateTime startdate)
@@ -900,33 +248,6 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the UploadingStartDate has changed.
-        /// </summary>
-        protected virtual void OnUploadingStartDateChanged(Nullable<DateTime> uploadingstartdate)
-        {
-            UploadingStartDateChanged?.Invoke(this, uploadingstartdate);
-            RaisePropertyChanged(nameof(UploadingStartDate));
-        }
-
-        /// <summary>
-        /// Called when the HeatingStartDate has changed.
-        /// </summary>
-        protected virtual void OnHeatingStartDateChanged(Nullable<DateTime> heatingstartdate)
-        {
-            HeatingStartDateChanged?.Invoke(this, heatingstartdate);
-            RaisePropertyChanged(nameof(HeatingStartDate));
-        }
-
-        /// <summary>
-        /// Called when the ActualStartDate has changed.
-        /// </summary>
-        protected virtual void OnActualStartDateChanged(Nullable<DateTime> actualstartdate)
-        {
-            ActualStartDateChanged?.Invoke(this, actualstartdate);
-            RaisePropertyChanged(nameof(ActualStartDate));
-        }
-
-        /// <summary>
         /// Called when the EndDate has changed.
         /// </summary>
         protected virtual void OnEndDateChanged(DateTime enddate)
@@ -945,105 +266,6 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the JobLength has changed.
-        /// </summary>
-        protected virtual void OnJobLengthChanged(Double joblength)
-        {
-            JobLengthChanged?.Invoke(this, joblength);
-            RaisePropertyChanged(nameof(JobLength));
-        }
-
-        /// <summary>
-        /// Called when the IsGradient has changed.
-        /// </summary>
-        protected virtual void OnIsGradientChanged(Boolean isgradient)
-        {
-            IsGradientChanged?.Invoke(this, isgradient);
-            RaisePropertyChanged(nameof(IsGradient));
-        }
-
-        /// <summary>
-        /// Called when the GradientResolutionCm has changed.
-        /// </summary>
-        protected virtual void OnGradientResolutionCmChanged(Int32 gradientresolutioncm)
-        {
-            GradientResolutionCmChanged?.Invoke(this, gradientresolutioncm);
-            RaisePropertyChanged(nameof(GradientResolutionCm));
-        }
-
-        /// <summary>
-        /// Called when the LiquidQuantityString has changed.
-        /// </summary>
-        protected virtual void OnLiquidQuantityStringChanged(String liquidquantitystring)
-        {
-            LiquidQuantityStringChanged?.Invoke(this, liquidquantitystring);
-            RaisePropertyChanged(nameof(LiquidQuantityString));
-        }
-
-        /// <summary>
-        /// Called when the CyanQuantity has changed.
-        /// </summary>
-        protected virtual void OnCyanQuantityChanged(Int32 cyanquantity)
-        {
-            CyanQuantityChanged?.Invoke(this, cyanquantity);
-            RaisePropertyChanged(nameof(CyanQuantity));
-        }
-
-        /// <summary>
-        /// Called when the MagentaQuantity has changed.
-        /// </summary>
-        protected virtual void OnMagentaQuantityChanged(Int32 magentaquantity)
-        {
-            MagentaQuantityChanged?.Invoke(this, magentaquantity);
-            RaisePropertyChanged(nameof(MagentaQuantity));
-        }
-
-        /// <summary>
-        /// Called when the YellowQuantity has changed.
-        /// </summary>
-        protected virtual void OnYellowQuantityChanged(Int32 yellowquantity)
-        {
-            YellowQuantityChanged?.Invoke(this, yellowquantity);
-            RaisePropertyChanged(nameof(YellowQuantity));
-        }
-
-        /// <summary>
-        /// Called when the BlackQuantity has changed.
-        /// </summary>
-        protected virtual void OnBlackQuantityChanged(Int32 blackquantity)
-        {
-            BlackQuantityChanged?.Invoke(this, blackquantity);
-            RaisePropertyChanged(nameof(BlackQuantity));
-        }
-
-        /// <summary>
-        /// Called when the TransparentQuantity has changed.
-        /// </summary>
-        protected virtual void OnTransparentQuantityChanged(Int32 transparentquantity)
-        {
-            TransparentQuantityChanged?.Invoke(this, transparentquantity);
-            RaisePropertyChanged(nameof(TransparentQuantity));
-        }
-
-        /// <summary>
-        /// Called when the LubricantQuantity has changed.
-        /// </summary>
-        protected virtual void OnLubricantQuantityChanged(Int32 lubricantquantity)
-        {
-            LubricantQuantityChanged?.Invoke(this, lubricantquantity);
-            RaisePropertyChanged(nameof(LubricantQuantity));
-        }
-
-        /// <summary>
-        /// Called when the CleanerQuantity has changed.
-        /// </summary>
-        protected virtual void OnCleanerQuantityChanged(Int32 cleanerquantity)
-        {
-            CleanerQuantityChanged?.Invoke(this, cleanerquantity);
-            RaisePropertyChanged(nameof(CleanerQuantity));
-        }
-
-        /// <summary>
         /// Called when the EndPosition has changed.
         /// </summary>
         protected virtual void OnEndPositionChanged(Double endposition)
@@ -1062,21 +284,12 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the IsHeadCleaning has changed.
-        /// </summary>
-        protected virtual void OnIsHeadCleaningChanged(Boolean isheadcleaning)
-        {
-            IsHeadCleaningChanged?.Invoke(this, isheadcleaning);
-            RaisePropertyChanged(nameof(IsHeadCleaning));
-        }
-
-        /// <summary>
-        /// Called when the IsSynchronized has changed.
+        /// Called when the Job has changed.
         /// </summary>
-        protected virtual void OnIsSynchronizedChanged(Boolean issynchronized)
+        protected virtual void OnJobChanged(Job job)
         {
-            IsSynchronizedChanged?.Invoke(this, issynchronized);
-            RaisePropertyChanged(nameof(IsSynchronized));
+            JobChanged?.Invoke(this, job);
+            RaisePropertyChanged(nameof(Job));
         }
 
         /// <summary>