additional device details

Disco.Models/ClientServices/EnrolmentInformation/BaseBoard.cs

@@ -0,0 +1,14 @@
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class BaseBoard
+    {
+        public string[] ConfigOptions { get; set; }
+        public string Manufacturer { get; set; }
+        public string Model { get; set; }
+        public string PartNumber { get; set; }
+        public string Product { get; set; }
+        public string SerialNumber { get; set; }
+        public string SKU { get; set; }
+        public string Version { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/Battery.cs

@@ -0,0 +1,14 @@
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class Battery
+    {
+        public string Availability { get; set; }
+        public string Chemistry { get; set; }
+        public string Description { get; set; }
+        public uint? DesignCapacity { get; set; }
+        public ulong? DesignVoltage { get; set; }
+        public string DeviceID { get; set; }
+        public uint? FullChargeCapacity { get; set; }
+        public string Name { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/Bios.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class Bios
+    {
+        public string[] BIOSVersion { get; set; }
+        public string Manufacturer { get; set; }
+        public DateTime? ReleaseDate { get; set; }
+        public string SerialNumber { get; set; }
+        public string SMBIOSBIOSVersion { get; set; }
+        public ushort? SMBIOSMajorVersion { get; set; }
+        public ushort? SMBIOSMinorVersion { get; set; }
+        public byte? SystemBiosMajorVersion { get; set; }
+        public byte? SystemBiosMinorVersion { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/ComputerSystem.cs

@@ -0,0 +1,16 @@
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class ComputerSystem
+    {
+        public string ChassisSKUNumber { get; set; }
+        public short? CurrentTimeZone { get; set;}
+        public string Description { get; set; }
+        public string[] OEMStringArray { get; set; }
+        public string PCSystemType { get; set; }
+        public string PrimaryOwnerContact { get; set; }
+        public string PrimaryOwnerName { get; set; }
+        public string[] Roles { get; set; }
+        public string SystemSKUNumber { get; set; }
+        public string SystemType { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/DeviceHardware.cs

@@ -11,10 +11,13 @@ namespace Disco.Models.ClientServices.EnrolmentInformation
         public string Model { get; set; }
         public string ModelType { get; set; }
 
+        public List<Bios> Bios { get; set; }
+        public List<BaseBoard> BasebBoard { get; set; }
+        public List<ComputerSystem> ComputerSystem { get; set; }
         public List<Processor> Processors { get; set; }
         public List<PhysicalMemory> PhysicalMemory { get; set; }
         public List<DiskDrive> DiskDrives { get; set; }
         public List<NetworkAdapter> NetworkAdapters { get; set; }
-
+        public List<Battery> Batteries { get; set; }
     }
 }

Disco.Models/ClientServices/EnrolmentInformation/DiskDrive.cs

@@ -11,7 +11,7 @@ namespace Disco.Models.ClientServices.EnrolmentInformation
         public string InterfaceType { get; set; }
         public string SerialNumber { get; set; }
         public string FirmwareRevision { get; set; }
-        public ulong Size { get; set; }
+        public ulong? Size { get; set; }
 
         public List<DiskDrivePartition> Partitions { get; set; }
     }

Disco.Models/ClientServices/EnrolmentInformation/DiskDrivePartition.cs

@@ -3,11 +3,11 @@
     public class DiskDrivePartition
     {
         public string DeviceID { get; set; }
-        public bool Bootable { get; set; }
-        public bool BootPartition { get; set; }
-        public bool PrimaryParition { get; set; }
-        public ulong Size { get; set; }
-        public ulong StartingOffset { get; set; }
+        public bool? Bootable { get; set; }
+        public bool? BootPartition { get; set; }
+        public bool? PrimaryParition { get; set; }
+        public ulong? Size { get; set; }
+        public ulong? StartingOffset { get; set; }
         public string Type { get; set; }
 
         public DiskLogical LogicalDisk { get; set; }

Disco.Models/ClientServices/EnrolmentInformation/DiskLogical.cs

@@ -7,8 +7,8 @@
         public string DriveType { get; set; }
         public string MediaType { get; set; }
         public string FileSystem { get; set; }
-        public ulong Size { get; set; }
-        public ulong FreeSpace { get; set; }
+        public ulong? Size { get; set; }
+        public ulong? FreeSpace { get; set; }
         public string VolumeName { get; set; }
         public string VolumeSerialNumber { get; set; }
     }

Disco.Models/ClientServices/EnrolmentInformation/PhysicalMemory.cs

@@ -7,9 +7,9 @@
         public string Manufacturer { get; set; }
         public string PartNumber { get; set; }
 
-        public ulong Capacity { get; set; }
-        public uint ConfiguredClockSpeed { get; set; }
-        public uint Speed { get; set; }
+        public ulong? Capacity { get; set; }
+        public uint? ConfiguredClockSpeed { get; set; }
+        public uint? Speed { get; set; }
 
         public string DeviceLocator { get; set; }
     }

Disco.Models/ClientServices/EnrolmentInformation/Processor.cs

@@ -7,9 +7,9 @@
         public string Name { get; set; }
         public string Description { get; set; }
         public string Architecture { get; set; }
-        public ushort Family { get; set; }
-        public uint MaxClockSpeed { get; set; }
-        public uint NumberOfCores { get; set; }
-        public uint NumberOfLogicalProcessors { get; set; }
+        public ushort? Family { get; set; }
+        public uint? MaxClockSpeed { get; set; }
+        public uint? NumberOfCores { get; set; }
+        public uint? NumberOfLogicalProcessors { get; set; }
     }
 }

Disco.Models/Disco.Models.csproj

@@ -49,6 +49,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BI\Config\OrganisationAddress.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\BaseBoard.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\Battery.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\Bios.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\ComputerSystem.cs" />
     <Compile Include="ClientServices\EnrolmentInformation\DiskLogical.cs" />
     <Compile Include="ClientServices\EnrolmentInformation\DeviceHardware.cs" />
     <Compile Include="ClientServices\EnrolmentInformation\DiskDrive.cs" />
@@ -60,6 +64,7 @@
     <Compile Include="ClientServices\EnrolmentInformation\WirelessProfile.cs" />
     <Compile Include="ClientServices\EnrolmentInformation\WirelessProfileStore.cs" />
     <Compile Include="ClientServices\EnrolmentInformation\WirelessProfileTransformation.cs" />
+    <Compile Include="Repository\Device\DeviceBatchAttachment.cs" />
     <Compile Include="Services\Devices\Exporting\DeviceExportFieldMetadata.cs" />
     <Compile Include="Services\Devices\Importing\IDeviceImportColumn.cs" />
     <Compile Include="Services\Devices\Importing\IDeviceImportDataReader.cs" />
@@ -202,6 +207,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Disco.Models/Repository/Device/DeviceDetail.cs

@@ -16,6 +16,10 @@ namespace Disco.Models.Repository
         public const string HardwareKeyProcessors = "Processors";
         public const string HardwareKeyPhysicalMemory = "PhysicalMemory";
         public const string HardwareKeyDiskDrives = "DiskDrives";
+        public const string HardwareKeyBios = "Bios";
+        public const string HardwareKeyBaseBoard = "BaseBoard";
+        public const string HardwareKeyComputerSystem = "ComputerSystem";
+        public const string HardwareKeyBatteries = "Batteries";
 
         [Column(Order = 0), Key]
         public string DeviceSerialNumber { get; set; }

Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs

@@ -104,6 +104,12 @@ namespace Disco.Models.Services.Devices.Exporting
         public bool Certificates { get; set; }
 
         // Details
+        [Display(ShortName = "Details", Name = "BIOS", Description = "The BIOS associated with the device")]
+        public bool DetailBios { get; set; }
+        [Display(ShortName = "Details", Name = "Base Board", Description = "The Base Board associated with the device")]
+        public bool DetailBaseBoard { get; set; }
+        [Display(ShortName = "Details", Name = "System", Description = "The System information associated with the device")]
+        public bool DetailComputerSystem { get; set; }
         [Display(ShortName = "Details", Name = "Processors", Description = "The CPU Processors associated with the device")]
         public bool DetailProcessors { get; set; }
         [Display(ShortName = "Details", Name = "Memory", Description = "The Memory/RAM associated with the device")]
@@ -116,7 +122,9 @@ namespace Disco.Models.Services.Devices.Exporting
         public bool DetailWLanAdapters { get; set; }
         [Display(ShortName = "Details", Name = "AC Adapter", Description = "The AC Adapter associated with the device")]
         public bool DetailACAdapter { get; set; }
-        [Display(ShortName = "Details", Name = "Battery", Description = "The Battery associated with the device")]
+        [Display(ShortName = "Details", Name = "Battery", Description = "The manually entered battery associated with the device")]
+        public bool DetailBatteries { get; set; }
+        [Display(ShortName = "Details", Name = "Batteries", Description = "The reported batteries associated with the device")]
         public bool DetailBattery { get; set; }
         [Display(ShortName = "Details", Name = "Keyboard", Description = "The Keyboard associated with the device")]
         public bool DetailKeyboard { get; set; }

Disco.Models/Services/Devices/Exporting/DeviceExportRecord.cs

@@ -11,12 +11,16 @@ namespace Disco.Models.Services.Devices.Exporting
 
         // Details
         public IList<DeviceDetail> DeviceDetails { get; set; }
+        public List<Bios> DeviceDetailBios { get; set; }
+        public List<BaseBoard> DeviceDetailBaseBoard { get; set; }
+        public List<ComputerSystem> DeviceDetailComputerSystem { get; set; }
         public List<Processor> DeviceDetailProcessors { get; set; }
         public List<PhysicalMemory> DeviceDetailPhysicalMemory { get; set; }
         public List<DiskDrive> DeviceDetailDiskDrives { get; set; }
         public List<NetworkAdapter> DeviceDetailNetworkAdapters { get; set; }
         public List<string> DeviceDetailLanMacAddresses { get; set; }
         public List<string> DeviceDetailWlanMacAddresses { get; set; }
+        public List<Battery> DeviceDetailBatteries { get; set; }
 
         // Model
         public int? ModelId { get; set; }