From 91cf4c18e3647fe75f6cbae2e52a9c96bbfab89e Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sat, 23 Nov 2019 18:01:07 +0000
Subject: [PATCH] Sort uploaded results.

---
 .../Admin/Controllers/ReportsController.cs    |  4 +++-
 .../Areas/Admin/Views/Reports/Index.cshtml    | 21 ++++++-------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
index d2ccf332..cbbe0620 100644
--- a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
+++ b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
@@ -16,7 +16,9 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
         public ReportsController(DicServerContext context) => _context = context;
 
         // GET: Admin/Reports
-        public async Task<IActionResult> Index() => View(await _context.Reports.ToListAsync());
+        public async Task<IActionResult> Index() =>
+            View(await _context.Reports.OrderBy(r => r.Manufacturer).ThenBy(r => r.Model).ThenBy(r => r.Revision).
+                                ThenBy(r => r.CompactFlash).ThenBy(r => r.Type).ToListAsync());
 
         // GET: Admin/Reports/Details/5
         public async Task<IActionResult> Details(int? id)
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml
index 2cb5b338..2077e70d 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml
@@ -4,18 +4,9 @@
     ViewData["Title"] = "Index";
 }
 <h1>Index</h1>
-<p>
-    <a asp-action="Create">Create New</a>
-</p>
 <table class="table">
     <thead>
     <tr>
-        <th>
-            @Html.DisplayNameFor(model => model.UploadedWhen)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.CompactFlash)
-        </th>
         <th>
             @Html.DisplayNameFor(model => model.Manufacturer)
         </th>
@@ -25,6 +16,9 @@
         <th>
             @Html.DisplayNameFor(model => model.Revision)
         </th>
+        <th>
+            @Html.DisplayNameFor(model => model.CompactFlash)
+        </th>
         <th>
             @Html.DisplayNameFor(model => model.Type)
         </th>
@@ -35,12 +29,6 @@
     @foreach (var item in Model)
     {
         <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.UploadedWhen)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.CompactFlash)
-            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Manufacturer)
             </td>
@@ -50,6 +38,9 @@
             <td>
                 @Html.DisplayFor(modelItem => item.Revision)
             </td>
+            <td>
+                @Html.DisplayFor(modelItem => item.CompactFlash)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Type)
             </td>