From 4a58d8df7e31e4aafbdd915beccf7b32ae58e0f7 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 19 May 2019 23:37:58 +0100
Subject: [PATCH] Optimize view of instruction set extensions by processor
 admin page.

---
 .../InstructionSetExtensionsByProcessorController.cs   |  8 +++++++-
 cicm_web/Areas/Admin/Models/CompanyViewModel.cs        |  3 ++-
 .../InstructionSetExtensionsByProcessorViewModel.cs    |  9 +++++++++
 .../InstructionSetExtensionsByProcessor/Index.cshtml   | 10 +++++-----
 cicm_web/cicm_web.csproj                               |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs

diff --git a/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs b/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
index 9815ff96..3b0b0c33 100644
--- a/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
+++ b/cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Cicm.Database.Models;
+using cicm_web.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -26,7 +27,12 @@ namespace cicm_web.Areas.Admin.Controllers
             IIncludableQueryable<InstructionSetExtensionsByProcessor, Processor> cicmContext =
                 _context.InstructionSetExtensionsByProcessor.Include(i => i.Extension).Include(i => i.Processor);
             return View(await cicmContext.OrderBy(e => e.Processor.Name).ThenBy(e => e.Extension.Extension)
-                                         .ToListAsync());
+                                         .Select(e => new InstructionSetExtensionsByProcessorViewModel
+                                          {
+                                              Id        = e.Id,
+                                              Extension = e.Extension.Extension,
+                                              Processor = e.Processor.Name
+                                          }).ToListAsync());
         }
 
         // GET: InstructionSetExtensionsByProcessor/Details/5
diff --git a/cicm_web/Areas/Admin/Models/CompanyViewModel.cs b/cicm_web/Areas/Admin/Models/CompanyViewModel.cs
index e193575e..bab1489c 100644
--- a/cicm_web/Areas/Admin/Models/CompanyViewModel.cs
+++ b/cicm_web/Areas/Admin/Models/CompanyViewModel.cs
@@ -16,7 +16,8 @@ namespace cicm_web.Areas.Admin.Models
         [DisplayFormat(DataFormatString = "{0:d}")]
         [DataType(DataType.Date)]
         public DateTime? Sold { get; set; }
-        public string SoldTo  { get; set; }
+        [DisplayName("Sold to")]
+        public string SoldTo { get;  set; }
         public string Country { get; set; }
         [Required]
         public CompanyStatus Status { get; set; }
diff --git a/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs b/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs
new file mode 100644
index 00000000..ec63972c
--- /dev/null
+++ b/cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs
@@ -0,0 +1,9 @@
+namespace cicm_web.Areas.Admin.Models
+{
+    public class InstructionSetExtensionsByProcessorViewModel
+    {
+        public string Extension;
+        public int    Id;
+        public string Processor;
+    }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml b/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
index ce1daf8c..fa70b411 100644
--- a/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
@@ -1,5 +1,5 @@
-@using Cicm.Database.Models
-@model IEnumerable<Cicm.Database.Models.InstructionSetExtensionsByProcessor>
+@using cicm_web.Areas.Admin.Models
+@model IEnumerable<cicm_web.Areas.Admin.Models.InstructionSetExtensionsByProcessorViewModel>
 
 @{
     ViewData["Title"] = "Index";
@@ -26,14 +26,14 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(InstructionSetExtensionsByProcessor item in Model)
+    @foreach(InstructionSetExtensionsByProcessorViewModel item in Model)
     {
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.Processor.Name)
+                @Html.DisplayFor(modelItem => item.Processor)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Extension.Extension)
+                @Html.DisplayFor(modelItem => item.Extension)
             </td>
             <td>
                 <a asp-action="Details"
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 910eed52..d46c68ac 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.535</Version>
+    <Version>3.0.99.536</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>