From 2c6dd080046340e35a46ee3e7141cccd7b870ef1 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 17 Nov 2019 22:32:50 +0000
Subject: [PATCH] Sort USB Vendors.

---
 .../Areas/Admin/Controllers/UsbVendorsController.cs  |  3 ++-
 .../Areas/Admin/Views/UsbVendors/Index.cshtml        | 12 ------------
 DiscImageChef.Server/Models/UsbVendor.cs             |  3 +++
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/UsbVendorsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/UsbVendorsController.cs
index b50d6fa9..df4699fd 100644
--- a/DiscImageChef.Server/Areas/Admin/Controllers/UsbVendorsController.cs
+++ b/DiscImageChef.Server/Areas/Admin/Controllers/UsbVendorsController.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Threading.Tasks;
 using DiscImageChef.Server.Models;
 using Microsoft.AspNetCore.Authorization;
@@ -14,7 +15,7 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
         public UsbVendorsController(DicServerContext context) => _context = context;
 
         // GET: Admin/UsbVendors
-        public async Task<IActionResult> Index() => View(await _context.UsbVendors.ToListAsync());
+        public async Task<IActionResult> Index() => View(await _context.UsbVendors.OrderBy(v => v.Vendor).ThenBy(v => v.VendorId).ToListAsync());
 
         // GET: Admin/UsbVendors/Details/5
         public async Task<IActionResult> Details(int? id)
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
index e7d9afa3..4315d22f 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
@@ -42,12 +42,6 @@
         <th>
             @Html.DisplayNameFor(model => model.Vendor)
         </th>
-        <th>
-            @Html.DisplayNameFor(model => model.AddedWhen)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.ModifiedWhen)
-        </th>
         <th></th>
     </tr>
     </thead>
@@ -61,12 +55,6 @@
             <td>
                 @Html.DisplayFor(modelItem => item.Vendor)
             </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.AddedWhen)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.ModifiedWhen)
-            </td>
             <td>
                 <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
             </td>
diff --git a/DiscImageChef.Server/Models/UsbVendor.cs b/DiscImageChef.Server/Models/UsbVendor.cs
index a95752e7..8bfa1510 100644
--- a/DiscImageChef.Server/Models/UsbVendor.cs
+++ b/DiscImageChef.Server/Models/UsbVendor.cs
@@ -32,6 +32,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
 
@@ -51,7 +52,9 @@ namespace DiscImageChef.Server.Models
         [Key]
         public int Id { get; set; }
 
+        [DisplayName("Manufacturer ID"), DisplayFormat(DataFormatString = "0x{0:X4}")]
         public ushort   VendorId     { get; set; }
+        [DisplayName("Manufacturer")]
         public string   Vendor       { get; set; }
         public DateTime AddedWhen    { get; set; }
         public DateTime ModifiedWhen { get; set; }