merge

1 files changed, 1 insertions, 41 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 679226fd2..b9224a6d6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -1,14 +1,11 @@
 using ColorMine.ColorSpaces;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using Tango.BL.Builders;
-using Tango.BL.Enumerations;
 using Tango.BL.Serialization;
 
 namespace Tango.BL.Entities
@@ -48,8 +45,6 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Color));
         }
 
-        [NotMapped]
-        [JsonIgnore]
         public Color Color
         {
             get
@@ -60,40 +55,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        /// <summary>
-        /// Gets or sets the thread head type.
-        /// </summary>
-        [NotMapped]
-        [JsonIgnore]
-        public HeadTypes RmlHeadType
-        {
-            get
-            {
-                return (HeadTypes)HeadType;
-            }
-            set
-            {
-                HeadType = value.ToInt32();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the thread qualification level.
-        /// </summary>
-        [NotMapped]
-        [JsonIgnore]
-        public RmlQualifications RmlQualificationLevel
-        {
-            get
-            {
-                return (RmlQualifications)QualificationLevel;
-            }
-            set
-            {
-                QualificationLevel = value.ToInt32();
-            }
-        }
-
         public ProcessParametersTablesGroup GetActiveProcessGroup()
         {
             return ProcessParametersTablesGroups.FirstOrDefault(x => x.Active);
@@ -103,13 +64,12 @@ namespace Tango.BL.Entities
         {
             return Task.Factory.StartNew<String>(() =>
             {
-                var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().WithSpools().Build();
+                var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().Build();
 
                 String result = rml.ToJson(new EntitySerializationStrategy()
                     .Include(() => rml.Cct)
                     .Include(() => rml.LiquidTypesRmls)
                     .Include(() => rml.ProcessParametersTablesGroups)
-                    .Include(() => rml.RmlsSpools)
                     .Include(typeof(ProcessParametersTablesGroup).GetProperty(nameof(ProcessParametersTablesGroup.ProcessParametersTables))),
                     EntitySerializationFlags.IgnoreCollections | EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented);