merge

1 files changed, 3 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index 14fe4f04e..9e83e7e4d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -18,7 +18,6 @@ namespace Tango.DAL.Remote.DB
         public MACHINE()
         {
             this.CATS = new HashSet<CAT>();
-            this.DATA_STORE_ITEMS = new HashSet<DATA_STORE_ITEMS>();
             this.JOBS = new HashSet<JOB>();
             this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>();
             this.SPOOLS = new HashSet<SPOOL>();
@@ -31,7 +30,6 @@ namespace Tango.DAL.Remote.DB
         public string NAME { get; set; }
         public System.DateTime PRODUCTION_DATE { get; set; }
         public string ORGANIZATION_GUID { get; set; }
-        public string SITE_GUID { get; set; }
         public string MACHINE_VERSION_GUID { get; set; }
         public string CONFIGURATION_GUID { get; set; }
         public string DEFAULT_RML_GUID { get; set; }
@@ -57,20 +55,19 @@ namespace Tango.DAL.Remote.DB
         public bool IS_DEVICE_REGISTERED { get; set; }
         public string DEVICE_ID { get; set; }
         public string DEVICE_NAME { get; set; }
-        public int HEAD_TYPE { get; set; }
-        public string ACTIVATION_KEY { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { get; set; }
+        public virtual COLOR_SPACES COLOR_SPACES { get; set; }
         public virtual CONFIGURATION CONFIGURATION { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<DATA_STORE_ITEMS> DATA_STORE_ITEMS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
         public virtual MACHINE_VERSIONS MACHINE_VERSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
         public virtual ORGANIZATION ORGANIZATION { get; set; }
+        public virtual RML RML { get; set; }
+        public virtual SPOOL_TYPES SPOOL_TYPES { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SPOOL> SPOOLS { get; set; }
     }