From 86470c6bca28b7073bf068e0bb211c49b912e2bf Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 19 May 2019 00:29:46 +0100
Subject: [PATCH] Sort processors by machine in admin page.

---
 Cicm.Database/Models/ProcessorsByMachine.cs   | 11 +++++---
 .../ProcessorsByMachinesController.cs         |  2 +-
 .../Views/ProcessorsByMachines/Create.cshtml  | 18 ++++++-------
 .../Views/ProcessorsByMachines/Delete.cshtml  | 12 ++++-----
 .../Views/ProcessorsByMachines/Details.cshtml | 25 +++++++++++-------
 .../Views/ProcessorsByMachines/Edit.cshtml    | 26 +++++++++----------
 .../Views/ProcessorsByMachines/Index.cshtml   | 12 ++++-----
 cicm_web/cicm_web.csproj                      |  2 +-
 8 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/Cicm.Database/Models/ProcessorsByMachine.cs b/Cicm.Database/Models/ProcessorsByMachine.cs
index adced5ac..1e8d59d5 100644
--- a/Cicm.Database/Models/ProcessorsByMachine.cs
+++ b/Cicm.Database/Models/ProcessorsByMachine.cs
@@ -28,14 +28,17 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 
+using System.ComponentModel;
+
 namespace Cicm.Database.Models
 {
     public class ProcessorsByMachine
     {
-        public int    ProcessorId { get; set; }
-        public int    MachineId   { get; set; }
-        public float? Speed       { get; set; }
-        public long   Id          { get; set; }
+        public int ProcessorId { get; set; }
+        public int MachineId   { get; set; }
+        [DisplayName("Speed (MHz)")]
+        public float? Speed { get; set; }
+        public long Id { get;      set; }
 
         public virtual Machine   Machine   { get; set; }
         public virtual Processor Processor { get; set; }
diff --git a/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs b/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
index 061a1867..07cb9a1c 100644
--- a/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
@@ -55,7 +55,7 @@ namespace cicm_web.Areas.Admin.Controllers
         {
             IIncludableQueryable<ProcessorsByMachine, Processor> cicmContext =
                 _context.ProcessorsByMachine.Include(p => p.Machine).Include(p => p.Processor);
-            return View(await cicmContext.ToListAsync());
+            return View(await cicmContext.OrderBy(p => p.Machine.Name).ThenBy(p => p.Processor.Name).ToListAsync());
         }
 
         // GET: Admin/ProcessorsByMachines/Details/5
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Create.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Create.cshtml
index 9da1fd9f..05cf2677 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Create.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Create.cshtml
@@ -45,6 +45,15 @@
             <div asp-validation-summary="ModelOnly"
                  class="text-danger">
             </div>
+            <div class="form-group">
+                <label asp-for="Machine"
+                       class="control-label">
+                </label>
+                <select asp-for="Machine"
+                        class="form-control"
+                        asp-items="ViewBag.MachineId">
+                </select>
+            </div>
             <div class="form-group">
                 <label asp-for="ProcessorId"
                        class="control-label">
@@ -54,15 +63,6 @@
                         asp-items="ViewBag.ProcessorId">
                 </select>
             </div>
-            <div class="form-group">
-                <label asp-for="MachineId"
-                       class="control-label">
-                </label>
-                <select asp-for="MachineId"
-                        class="form-control"
-                        asp-items="ViewBag.MachineId">
-                </select>
-            </div>
             <div class="form-group">
                 <label asp-for="Speed"
                        class="control-label">
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Delete.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Delete.cshtml
index fb61d8cf..a7848992 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Delete.cshtml
@@ -42,12 +42,6 @@
     <h4>Processors by machine</h4>
     <hr />
     <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Speed)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Speed)
-        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Machine)
         </dt>
@@ -60,6 +54,12 @@
         <dd>
             @Html.DisplayFor(model => model.Processor.Name)
         </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Speed)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Speed)
+        </dd>
     </dl>
 
     <form asp-action="Delete">
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml
index f1d2b441..46350371 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml
@@ -41,12 +41,6 @@
     <h4>Processors by machine</h4>
     <hr />
     <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Speed)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Speed)
-        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Machine)
         </dt>
@@ -59,9 +53,22 @@
         <dd>
             @Html.DisplayFor(model => model.Processor.Name)
         </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Speed)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Speed)
+        </dd>
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
-    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
-</div>
+    <a asp-action="Edit"
+       asp-route-id="@Model.Id"
+       class="btn btn-primary">
+        Edit
+    </a>
+    <a asp-action="Index"
+       class="btn btn-secondary">
+        Back to List
+    </a>
+</div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml
index f436ee07..e7146b73 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml
@@ -46,19 +46,7 @@
                  class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="ProcessorId"
-                       class="control-label">
-                </label>
-                <select asp-for="ProcessorId"
-                        class="form-control"
-                        asp-items="ViewBag.ProcessorId">
-                </select>
-                <span asp-validation-for="ProcessorId"
-                      class="text-danger">
-                </span>
-            </div>
-            <div class="form-group">
-                <label asp-for="MachineId"
+                <label asp-for="Machine"
                        class="control-label">
                 </label>
                 <select asp-for="MachineId"
@@ -69,6 +57,18 @@
                       class="text-danger">
                 </span>
             </div>
+            <div class="form-group">
+                <label asp-for="Processor"
+                       class="control-label">
+                </label>
+                <select asp-for="ProcessorId"
+                        class="form-control"
+                        asp-items="ViewBag.ProcessorId">
+                </select>
+                <span asp-validation-for="ProcessorId"
+                      class="text-danger">
+                </span>
+            </div>
             <div class="form-group">
                 <label asp-for="Speed"
                        class="control-label">
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml
index f2c956b1..1882dd5e 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Index.cshtml
@@ -47,15 +47,15 @@
 <table class="table">
     <thead>
     <tr>
-        <th>
-            @Html.DisplayNameFor(model => model.Speed)
-        </th>
         <th>
             @Html.DisplayNameFor(model => model.Machine)
         </th>
         <th>
             @Html.DisplayNameFor(model => model.Processor)
         </th>
+        <th>
+            @Html.DisplayNameFor(model => model.Speed)
+        </th>
         <th></th>
     </tr>
     </thead>
@@ -63,15 +63,15 @@
     @foreach(ProcessorsByMachine item in Model)
     {
         <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.Speed)
-            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Machine.Name)
             </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Processor.Name)
             </td>
+            <td>
+                @Html.DisplayFor(modelItem => item.Speed)
+            </td>
             <td>
                 <a asp-action="Details"
                    asp-route-id="@item.Id"
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 95629d2e..e6ac704d 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.443</Version>
+    <Version>3.0.99.445</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>