diff --git a/Cicm.Database/Models/Screen.cs b/Cicm.Database/Models/Screen.cs index 24ee1b8a..2ba163e4 100644 --- a/Cicm.Database/Models/Screen.cs +++ b/Cicm.Database/Models/Screen.cs @@ -17,6 +17,7 @@ namespace Cicm.Database.Models [DisplayName("Diagonal (inches)")] public double Diagonal { get; set; } [Required] + [DisplayName("Native resolution")] public virtual Resolution NativeResolution { get; set; } [Range(2, 281474976710656)] [DisplayName("Effective colors")] diff --git a/cicm_web/Areas/Admin/Controllers/ScreensController.cs b/cicm_web/Areas/Admin/Controllers/ScreensController.cs index e9f63c84..e00a5c12 100644 --- a/cicm_web/Areas/Admin/Controllers/ScreensController.cs +++ b/cicm_web/Areas/Admin/Controllers/ScreensController.cs @@ -20,8 +20,9 @@ namespace cicm_web.Areas.Admin.Controllers // GET: Screens public async Task Index() => - View(await _context.Screens.OrderBy(s => s.Diagonal).ThenBy(s => s.EffectiveColors).ThenBy(s => s.Type) - .ThenBy(s => s.Size).ToListAsync()); + View(await _context.Screens.OrderBy(s => s.Diagonal).ThenBy(s => s.EffectiveColors) + .ThenBy(s => s.NativeResolution.ToString()).ThenBy(s => s.Type).ThenBy(s => s.Size) + .ToListAsync()); // GET: Screens/Details/5 public async Task Details(int? id) diff --git a/cicm_web/Areas/Admin/Views/Screens/Index.cshtml b/cicm_web/Areas/Admin/Views/Screens/Index.cshtml index 02746e1a..27e04101 100644 --- a/cicm_web/Areas/Admin/Views/Screens/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/Screens/Index.cshtml @@ -20,7 +20,7 @@ @Html.DisplayNameFor(model => model.Diagonal) - @Html.DisplayNameFor(model => model.Size) + @Html.DisplayNameFor(model => model.NativeResolution) @Html.DisplayNameFor(model => model.EffectiveColors) @@ -38,9 +38,9 @@ @Html.DisplayFor(modelItem => item.Diagonal) - - @Html.DisplayFor(modelItem => item.Size) - + + @Html.DisplayFor(modelItem => item.NativeResolution) + @Html.DisplayFor(modelItem => item.EffectiveColors) diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index 6e4cd9e7..9fa36a08 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.721 + 3.0.99.722 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website