Update: Device Count Details

More information about device membership in Batches, Profiles and Models.
garysharp · Jul 25, 2013 · 1950336 · 1950336
1 parent ad6b1b1
commit 1950336
Show file tree

Hide file tree

Showing 27 changed files with 852 additions and 451 deletions.
diff --git a/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModel.cs b/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModel.cs
@@ -10,6 +10,9 @@ public interface ConfigDeviceBatchShowModel : BaseUIModel
     {
         Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
         List<Disco.Models.Repository.DeviceModel> DeviceModels { get; set; }
+
+        List<ConfigDeviceBatchShowModelMembership> DeviceModelMembers { get; set; }
+
         int DeviceCount { get; set; }
         int DeviceDecommissionedCount { get; set; }
         bool CanDelete { get; set; }

diff --git a/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModelMembership.cs b/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchShowModelMembership.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.UI.Config.DeviceBatch
+{
+    public interface ConfigDeviceBatchShowModelMembership : BaseUIModel
+    {
+        Disco.Models.Repository.DeviceModel DeviceModel { get; set; }
+        int DeviceCount { get; set; }
+        int DeviceDecommissionedCount { get; set; }
+    }
+}
diff --git a/...l/ConfigDeviceModelShowModelComponents.cs → ...Model/ConfigDeviceModelComponentsModel.cs b/...l/ConfigDeviceModelShowModelComponents.cs → ...Model/ConfigDeviceModelComponentsModel.cs
diff --git a/Disco.Models/UI/Config/DeviceModel/ConfigDeviceModelIndexModelItem.cs b/Disco.Models/UI/Config/DeviceModel/ConfigDeviceModelIndexModelItem.cs
@@ -14,5 +14,6 @@ public interface ConfigDeviceModelIndexModelItem
         string Model { get; set; }
         string ModelType { get; set; }
         int DeviceCount { get; set; }
+        int DeviceDecommissionedCount { get; set; }
     }
 }
diff --git a/Disco.Models/UI/Config/DeviceModel/ConfigDeviceModelShowModel.cs b/Disco.Models/UI/Config/DeviceModel/ConfigDeviceModelShowModel.cs
@@ -12,6 +12,9 @@ public interface ConfigDeviceModelShowModel : BaseUIModel
 
         ConfigDeviceModelComponentsModel DeviceComponentsModel { get; set; }
 
+        int DeviceCount { get; set; }
+        int DeviceDecommissionedCount { get; set; }
+
         bool CanDelete { get; set; }
     }
 }
diff --git a/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs b/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs
@@ -11,6 +11,9 @@ public interface ConfigDeviceProfileShowModel : BaseUIModel
         Disco.Models.Repository.DeviceProfile DeviceProfile { get; set; }
         List<Disco.Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
 
+        int DeviceCount { get; set; }
+        int DeviceDecommissionedCount { get; set; }
+
         bool CanDelete { get; set; }
     }
 }
diff --git a/Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs b/Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs
@@ -20,18 +20,25 @@ public virtual ActionResult Index(int? id)
 
             if (id.HasValue)
             {
-                var m = new Models.DeviceBatch.ShowModel()
+                var m = dbContext.DeviceBatches.Where(db => db.Id == id.Value)
+                    .Select(db => new Models.DeviceBatch.ShowModel()
+                    {
+                        DeviceBatch = db,
+                        DeviceCount = db.Devices.Count(),
+                        DeviceDecommissionedCount = db.Devices.Count(d => d.DecommissionedDate.HasValue)
+                    }).FirstOrDefault();
+
+                if (m == null || m.DeviceBatch == null)
+                    throw new ArgumentException("Invalid Device Batch Id", "id");
+
+                m.DeviceModelMembers = m.DeviceBatch.Devices.GroupBy(d => d.DeviceModel).Select(dG => new Models.DeviceBatch._ShowModelMembership()
                 {
-                    DeviceBatch = dbContext.DeviceBatches.Find(id)
-                };
-                if (m.DeviceBatch == null)
-                {
-                    return RedirectToAction(MVC.Config.DeviceBatch.Index(null));
-                }
-                m.CanDelete = m.DeviceBatch.CanDelete(dbContext);
+                    DeviceModel = dG.Key,
+                    DeviceCount = dG.Count(),
+                    DeviceDecommissionedCount = dG.Count(d => d.DecommissionedDate.HasValue)
+                }).ToArray().Cast<ConfigDeviceBatchShowModelMembership>().ToList();
 
-                m.DeviceCount = m.DeviceBatch.Devices.Count();
-                m.DeviceDecommissionedCount = m.DeviceBatch.Devices.Count(d => d.DecommissionedDate.HasValue);
+                m.CanDelete = m.DeviceBatch.CanDelete(dbContext);
 
                 m.DeviceModels = dbContext.DeviceModels.ToList();
 
@@ -46,7 +53,7 @@ public virtual ActionResult Index(int? id)
 
                 // UI Extensions
                 UIExtensions.ExecuteExtensions<ConfigDeviceBatchIndexModel>(this.ControllerContext, m);
-                
+
                 return View(m);
             }
         }

diff --git a/Disco.Web/Areas/Config/Controllers/DeviceModelController.cs b/Disco.Web/Areas/Config/Controllers/DeviceModelController.cs
@@ -17,16 +17,22 @@ public virtual ActionResult Index(int? id)
         {
             if (id.HasValue)
             {
-                var m = new Models.DeviceModel.ShowModel()
+                var m = dbContext.DeviceModels.Include("DeviceComponents").Where(dm => dm.Id == id.Value).Select(dm => new Models.DeviceModel.ShowModel()
                 {
-                    DeviceModel = dbContext.DeviceModels.Include("DeviceComponents.JobSubTypes").Where(dm => dm.Id == id.Value).FirstOrDefault(),
-                    WarrantyProviders = Plugins.GetPluginFeatures(typeof(WarrantyProviderFeature))
-                };
+                    DeviceModel = dm,
+                    DeviceCount = dm.Devices.Count(),
+                    DeviceDecommissionedCount = dm.Devices.Where(d => d.DecommissionedDate.HasValue).Count()
+                }).FirstOrDefault();
+
+                if (m == null || m.DeviceModel == null)
+                    throw new ArgumentException("Invalid Device Model Id", "id");
+
+                m.WarrantyProviders = Plugins.GetPluginFeatures(typeof(WarrantyProviderFeature));
 
                 m.DeviceComponentsModel = new Models.DeviceModel.ComponentsModel()
                 {
                     DeviceModelId = m.DeviceModel.Id,
-                    DeviceComponents = m.DeviceModel.DeviceComponents.ToList(),
+                    DeviceComponents = dbContext.DeviceComponents.Include("JobSubTypes").Where(dc => dc.DeviceModelId == m.DeviceModel.Id).ToList(),
                     JobSubTypes = dbContext.JobSubTypes.Where(jst => jst.JobTypeId == Disco.Models.Repository.JobType.JobTypeIds.HNWar).ToList()
                 };
 

diff --git a/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs b/Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
@@ -20,14 +20,18 @@ public virtual ActionResult Index(int? id)
         {
             if (id.HasValue)
             {
-                var m = new Models.DeviceProfile.ShowModel()
+                var m = dbContext.DeviceProfiles.Where(dp => dp.Id == id.Value).Select(dp => new Models.DeviceProfile.ShowModel()
                 {
-                    DeviceProfile = dbContext.DeviceProfiles.Find(id.Value),
-                    OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses,
-                    CertificateProviders = Plugins.GetPluginFeatures(typeof(CertificateProviderFeature))
-                };
+                    DeviceProfile = dp,
+                    DeviceCount = dp.Devices.Count(),
+                    DeviceDecommissionedCount = dp.Devices.Where(d => d.DecommissionedDate.HasValue).Count()
+                }).FirstOrDefault();
 
-                //m.Devices = BI.DeviceBI.SelectDeviceSearchResultItem(dbContext.Devices.Where(d => d.DeviceProfileId == m.DeviceProfile.Id));
+                if (m == null || m.DeviceProfile == null)
+                    throw new ArgumentException("Invalid Device Profile Id", "id");
+
+                m.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
+                m.CertificateProviders = Plugins.GetPluginFeatures(typeof(CertificateProviderFeature));
 
                 var DistributionValues = Enum.GetValues(typeof(Disco.Models.Repository.DeviceProfile.DistributionTypes));
                 m.DeviceProfileDistributionTypes = new List<SelectListItem>();

diff --git a/Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs b/Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs
@@ -11,6 +11,7 @@ public class ShowModel : ConfigDeviceBatchShowModel
     {
         public Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
         public List<Disco.Models.Repository.DeviceModel> DeviceModels { get; set; }
+        public List<ConfigDeviceBatchShowModelMembership> DeviceModelMembers { get; set; }
         public int DeviceCount { get; set; }
         public int DeviceDecommissionedCount { get; set; }
         public bool CanDelete { get; set; }

diff --git a/Disco.Web/Areas/Config/Models/DeviceBatch/_ShowModelMembership.cs b/Disco.Web/Areas/Config/Models/DeviceBatch/_ShowModelMembership.cs
@@ -0,0 +1,15 @@
+using Disco.Models.UI.Config.DeviceBatch;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Disco.Web.Areas.Config.Models.DeviceBatch
+{
+    public class _ShowModelMembership : ConfigDeviceBatchShowModelMembership
+    {
+        public Disco.Models.Repository.DeviceModel DeviceModel { get; set; }
+        public int DeviceCount { get; set; }
+        public int DeviceDecommissionedCount { get; set; }
+    }
+}
diff --git a/Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs b/Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs
@@ -21,7 +21,8 @@ public static IndexModel Build(DiscoDataContext dbContext)
                 Manufacturer = dm.Manufacturer,
                 Model = dm.Model,
                 ModelType = dm.ModelType,
-                DeviceCount = dm.Devices.Count
+                DeviceCount = dm.Devices.Count,
+                DeviceDecommissionedCount = dm.Devices.Count(d => d.DecommissionedDate.HasValue)
             }).ToArray().Cast<ConfigDeviceModelIndexModelItem>().ToList();
 
             return m;

diff --git a/Disco.Web/Areas/Config/Models/DeviceModel/ShowModel.cs b/Disco.Web/Areas/Config/Models/DeviceModel/ShowModel.cs
@@ -15,6 +15,9 @@ public class ShowModel : ConfigDeviceModelShowModel
 
         public List<PluginFeatureManifest> WarrantyProviders { get; set; }
 
+        public int DeviceCount { get; set; }
+        public int DeviceDecommissionedCount { get; set; }
+
         public bool CanDelete { get; set; }
     }
 }
diff --git a/Disco.Web/Areas/Config/Models/DeviceModel/_IndexModelItem.cs b/Disco.Web/Areas/Config/Models/DeviceModel/_IndexModelItem.cs
@@ -15,6 +15,7 @@ public class _IndexModelItem : ConfigDeviceModelIndexModelItem
         public string Model { get; set; }
         public string ModelType { get; set; }
         public int DeviceCount { get; set; }
+        public int DeviceDecommissionedCount { get; set; }
 
         public override string ToString()
         {

diff --git a/Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs b/Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs
@@ -16,6 +16,9 @@ public class ShowModel : ConfigDeviceProfileShowModel
 
         public List<PluginFeatureManifest> CertificateProviders { get; set; }
 
+        public int DeviceCount { get; set; }
+        public int DeviceDecommissionedCount { get; set; }
+
         public bool CanDelete { get; set; }
     }
 }
diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml
@@ -53,8 +53,8 @@
                 }
                 @if (item.DeviceDecommissionedCount > 0)
                 { 
-                    <span class="smallMessage" title="@(item.DeviceDecommissionedCount) Decommissioned">
-                        (@(item.DeviceDecommissionedCount))</span>
+                    <span class="smallMessage" title="@(item.DeviceDecommissionedCount.ToString("n0")) Decommissioned">
+                        (@(item.DeviceDecommissionedCount.ToString("n0")))</span>
                 }
             </td>
         </tr>

diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -229,22 +229,22 @@ Device Count
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 1775), Tuple.Create("\"", 1831)
+WriteAttribute("title", Tuple.Create(" title=\"", 1775), Tuple.Create("\"", 1846)
 
             #line 56 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 1783), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount
+, Tuple.Create(Tuple.Create("", 1783), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
 
             #line default
             #line hidden
 , 1783), false)
-, Tuple.Create(Tuple.Create(" ", 1816), Tuple.Create("Decommissioned", 1817), true)
+, Tuple.Create(Tuple.Create(" ", 1831), Tuple.Create("Decommissioned", 1832), true)
 );
 
 WriteLiteral(">\r\n                        (");
 
 
             #line 57 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
-                     Write(item.DeviceDecommissionedCount);
+                     Write(item.DeviceDecommissionedCount.ToString("n0"));
 
 
             #line default