FSE Stats Module.

Extended job run structure.
CSV export.

4 files changed, 174 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
index 7c5ba4626..becb51888 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
@@ -270,6 +270,38 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// application version
+        /// </summary>
+        public String ApplicationVersion 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// firmware version
+        /// </summary>
+        public String FirmwareVersion 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ce version
+        /// </summary>
+        public String CeVersion 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// process parameters table guid
+        /// </summary>
+        public String ProcessParametersTableGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// is synchronized
         /// </summary>
         public Boolean IsSynchronized 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
index 7c9d7dcea..614c6f8c6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
@@ -860,6 +860,9 @@ namespace Tango.BL.Entities
                 JobFileBrushStop st = new JobFileBrushStop();
                 stop.MapPropertiesTo(st, MappingFlags.NoReferenceTypes | MappingFlags.NoNullStrings);
                 st.ColorCatalogItemGuid = stop.ColorCatalogsItemGuid.ToStringOrEmpty();
+                st.BestMatchR = stop.BestMatchR.HasValue ? stop.BestMatchR.Value : 0;
+                st.BestMatchG = stop.BestMatchG.HasValue ? stop.BestMatchG.Value : 0;
+                st.BestMatchB = stop.BestMatchB.HasValue ? stop.BestMatchB.Value : 0;
 
                 foreach (var idsPack in machine.Configuration.NoneEmptyIdsPacks)
                 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index dbdea9ac6..dc625f6f3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -81,6 +81,12 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> IsHeadCleaningChanged;
 
+        public event EventHandler<String> ApplicationVersionChanged;
+
+        public event EventHandler<String> FirmwareVersionChanged;
+
+        public event EventHandler<String> CeVersionChanged;
+
         public event EventHandler<Boolean> IsSynchronizedChanged;
 
         protected String _machineguid;
@@ -914,6 +920,112 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _applicationversion;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase application version.
+        /// </summary>
+
+        [Column("APPLICATION_VERSION")]
+
+        public  String ApplicationVersion
+        {
+            get 
+            {
+                return _applicationversion; 
+            }
+
+            set 
+            {
+                if (_applicationversion != value)
+                {
+                    _applicationversion = value;
+
+                    OnApplicationVersionChanged(value);
+
+                }
+            }
+        }
+
+        protected String _firmwareversion;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase firmware version.
+        /// </summary>
+
+        [Column("FIRMWARE_VERSION")]
+
+        public  String FirmwareVersion
+        {
+            get 
+            {
+                return _firmwareversion; 
+            }
+
+            set 
+            {
+                if (_firmwareversion != value)
+                {
+                    _firmwareversion = value;
+
+                    OnFirmwareVersionChanged(value);
+
+                }
+            }
+        }
+
+        protected String _ceversion;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ce version.
+        /// </summary>
+
+        [Column("CE_VERSION")]
+
+        public  String CeVersion
+        {
+            get 
+            {
+                return _ceversion; 
+            }
+
+            set 
+            {
+                if (_ceversion != value)
+                {
+                    _ceversion = value;
+
+                    OnCeVersionChanged(value);
+
+                }
+            }
+        }
+
+        protected String _processparameterstableguid;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase process parameters table guid.
+        /// </summary>
+
+        [Column("PROCESS_PARAMETERS_TABLE_GUID")]
+
+        public  String ProcessParametersTableGuid
+        {
+            get 
+            {
+                return _processparameterstableguid; 
+            }
+
+            set 
+            {
+                if (_processparameterstableguid != value)
+                {
+                    _processparameterstableguid = value;
+
+                }
+            }
+        }
+
         protected Boolean _issynchronized;
 
         /// <summary>
@@ -1185,6 +1297,33 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the ApplicationVersion has changed.
+        /// </summary>
+        protected virtual void OnApplicationVersionChanged(String applicationversion)
+        {
+            ApplicationVersionChanged?.Invoke(this, applicationversion);
+            RaisePropertyChanged(nameof(ApplicationVersion));
+        }
+
+        /// <summary>
+        /// Called when the FirmwareVersion has changed.
+        /// </summary>
+        protected virtual void OnFirmwareVersionChanged(String firmwareversion)
+        {
+            FirmwareVersionChanged?.Invoke(this, firmwareversion);
+            RaisePropertyChanged(nameof(FirmwareVersion));
+        }
+
+        /// <summary>
+        /// Called when the CeVersion has changed.
+        /// </summary>
+        protected virtual void OnCeVersionChanged(String ceversion)
+        {
+            CeVersionChanged?.Invoke(this, ceversion);
+            RaisePropertyChanged(nameof(CeVersion));
+        }
+
+        /// <summary>
         /// Called when the IsSynchronized has changed.
         /// </summary>
         protected virtual void OnIsSynchronizedChanged(Boolean issynchronized)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
index 00fb75b42..d254475d9 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
@@ -49,11 +49,5 @@ namespace Tango.BL.Enumerations
         [Description("Catalog")]
         Catalog = 4,
 
-        /// <summary>
-        /// (Catalog)
-        /// </summary>
-        [Description("HSB")]
-        HSB = 5,
-
     }
 }