Remove: 'Active' Device property

No longer needed.
2013-02-21 18:25:46 +11:00
parent 20a12c1c99
commit 9e2f9a646f
10 changed files with 437 additions and 261 deletions
@@ -1,67 +1,69 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Disco.Models.Repository
-{
-    public class Device
-    {
-        [Required(ErrorMessage="The Serial Number is Required"), Key, StringLength(60)]
-        public string SerialNumber { get; set; }
-
-        [StringLength(40)]
-        public string AssetNumber { get; set; }
-        [StringLength(250)]
-        public string Location { get; set; }
-
-        public int? DeviceModelId { get; set; }
-        [Range(1, int.MaxValue, ErrorMessage="A valid Device Profile is Required")]
-        public int DeviceProfileId { get; set; }
-        public int? DeviceBatchId { get; set; }
-
-        [StringLength(24)]
-        public string ComputerName { get; set; }
-        public string AssignedUserId { get; set; }
-        public DateTime? LastNetworkLogonDate { get; set; }
-
-        // 2012-06-21 - Removed
-        //[StringLength(24)]
-        //public string CertificateStoreReference { get; set; }
-        
-        public bool AllowUnauthenticatedEnrol { get; set; }
-
-        public bool Active { get; set; }
-
-        public DateTime CreatedDate { get; set; }
-        public DateTime? EnrolledDate { get; set; }
-        public DateTime? LastEnrolDate { get; set; }
-        public DateTime? DecommissionedDate { get; set; }
-
-        [ForeignKey("DeviceModelId")]
-        public virtual DeviceModel DeviceModel { get; set; }
-        [ForeignKey("DeviceProfileId")]
-        public virtual DeviceProfile DeviceProfile { get; set; }
-        [ForeignKey("DeviceBatchId")]
-        public virtual DeviceBatch DeviceBatch { get; set; }
-        [ForeignKey("AssignedUserId")]
-        public virtual User AssignedUser { get; set; }
-
-        public virtual IList<DeviceUserAssignment> DeviceUserAssignments { get; set; }
-        public virtual IList<DeviceDetail> DeviceDetails { get; set; }
-        public virtual IList<DeviceAttachment> DeviceAttachments { get; set; }
-        
-        [InverseProperty("DeviceSerialNumber")]
-        public virtual IList<Job> Jobs { get; set; }
-
-        public override string ToString()
-        {
-            if (DeviceModel != null)
-                return string.Format("{0} - {1}", this.DeviceModel, this.SerialNumber);
-            else
-                return this.SerialNumber;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Disco.Models.Repository
+{
+    public class Device
+    {
+        [Required(ErrorMessage="The Serial Number is Required"), Key, StringLength(60)]
+        public string SerialNumber { get; set; }
+
+        [StringLength(40)]
+        public string AssetNumber { get; set; }
+        [StringLength(250)]
+        public string Location { get; set; }
+
+        public int? DeviceModelId { get; set; }
+        [Range(1, int.MaxValue, ErrorMessage="A valid Device Profile is Required")]
+        public int DeviceProfileId { get; set; }
+        public int? DeviceBatchId { get; set; }
+
+        [StringLength(24)]
+        public string ComputerName { get; set; }
+        public string AssignedUserId { get; set; }
+        public DateTime? LastNetworkLogonDate { get; set; }
+
+        // 2012-06-21 - Removed
+        //[StringLength(24)]
+        //public string CertificateStoreReference { get; set; }
+        
+        public bool AllowUnauthenticatedEnrol { get; set; }
+
+        // Removed 2013-02-21 G#: Redundant - See DecommissionedDate
+        //public bool Active { get; set; }
+        // End Removed 2013-02-21
+
+        public DateTime CreatedDate { get; set; }
+        public DateTime? EnrolledDate { get; set; }
+        public DateTime? LastEnrolDate { get; set; }
+        public DateTime? DecommissionedDate { get; set; }
+
+        [ForeignKey("DeviceModelId")]
+        public virtual DeviceModel DeviceModel { get; set; }
+        [ForeignKey("DeviceProfileId")]
+        public virtual DeviceProfile DeviceProfile { get; set; }
+        [ForeignKey("DeviceBatchId")]
+        public virtual DeviceBatch DeviceBatch { get; set; }
+        [ForeignKey("AssignedUserId")]
+        public virtual User AssignedUser { get; set; }
+
+        public virtual IList<DeviceUserAssignment> DeviceUserAssignments { get; set; }
+        public virtual IList<DeviceDetail> DeviceDetails { get; set; }
+        public virtual IList<DeviceAttachment> DeviceAttachments { get; set; }
+        
+        [InverseProperty("DeviceSerialNumber")]
+        public virtual IList<Job> Jobs { get; set; }
+
+        public override string ToString()
+        {
+            if (DeviceModel != null)
+                return string.Format("{0} - {1}", this.DeviceModel, this.SerialNumber);
+            else
+                return this.SerialNumber;
+        }
+    }
+}