MERGE

8 files changed, 77 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
index df2302456..b0f85c1ab 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
@@ -10,6 +10,25 @@ namespace Tango.DAL.Observables
     public class Rml : ObservableEntity<RML>
     {
 
+        private String _name;
+        /// <summary>
+        /// Gets or sets the rml name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
         private String _manufacturer;
         /// <summary>
         /// Gets or sets the rml manufacturer.
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs
index 53a56c61f..9b32088fa 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs
@@ -8,5 +8,12 @@ namespace Tango.DAL.Observables
 {
     public enum FiberShapes
     {
+
+        /// <summary>
+        /// (Triangle)
+        /// </summary>
+        [Description("Triangle")]
+        Triangle = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs
index aa2dfec11..66ef5b189 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs
@@ -8,5 +8,12 @@ namespace Tango.DAL.Observables
 {
     public enum FiberSynths
     {
+
+        /// <summary>
+        /// (Some syntheses type)
+        /// </summary>
+        [Description("Some syntheses type")]
+        Somesynthesestype = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs
index e5fc1e320..6d2903333 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs
@@ -8,5 +8,12 @@ namespace Tango.DAL.Observables
 {
     public enum LinearMassDensityUnits
     {
+
+        /// <summary>
+        /// (Dex)
+        /// </summary>
+        [Description("Dex")]
+        Dex = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs
index 8f7016c5d..d961ef8a5 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs
@@ -8,5 +8,12 @@ namespace Tango.DAL.Observables
 {
     public enum MediaConditions
     {
+
+        /// <summary>
+        /// (Treated)
+        /// </summary>
+        [Description("Treated")]
+        Treated = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs
index 252b2772a..552b43d55 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs
@@ -8,5 +8,12 @@ namespace Tango.DAL.Observables
 {
     public enum MediaMaterials
     {
+
+        /// <summary>
+        /// (Nylon)
+        /// </summary>
+        [Description("Nylon")]
+        Nylon = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs
index c47a96064..aae066631 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs
@@ -8,5 +8,12 @@ namespace Tango.DAL.Observables
 {
     public enum MediaPurposes
     {
+
+        /// <summary>
+        /// (Embroidery)
+        /// </summary>
+        [Description("Embroidery")]
+        Embroidery = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
index b5a9747b2..63fdce62a 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
@@ -129,6 +129,22 @@ namespace Tango.DAL.Observables
                 eventType.EventTypesActions = eventType.EventTypesActions.Where(x => !x.Deleted).ToObservableCollection();
             }
 
+            MediaMaterials = Context.MEDIA_MATERIALS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<MediaMaterial>(x)).ToObservableCollection();
+
+            MediaColors = Context.MEDIA_COLORS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<MediaColor>(x)).ToObservableCollection();
+
+            MediaPurposes = Context.MEDIA_PURPOSES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<MediaPurpos>(x)).ToObservableCollection();
+
+            MediaConditions = Context.MEDIA_CONDITIONS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<MediaCondition>(x)).ToObservableCollection();
+
+            LinearMassDensityUnits = Context.LINEAR_MASS_DENSITY_UNITS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<LinearMassDensityUnit>(x)).ToObservableCollection();
+
+            FiberShapes = Context.FIBER_SHAPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<FiberShape>(x)).ToObservableCollection();
+
+            FiberSynths = Context.FIBER_SYNTHS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<FiberSynth>(x)).ToObservableCollection();
+
+            Rmls = Context.RMLS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Rml>(x)).ToObservableCollection();
+
             InitCollectionSources();
         }