Sort resolutions in admin page.

Cicm.Database/Models/Resolution.cs

@@ -29,6 +29,7 @@
 *******************************************************************************/
 
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
@@ -44,8 +45,11 @@ namespace Cicm.Database.Models
         public int   Height  { get; set; }
         public long? Colors  { get; set; }
         public long? Palette { get; set; }
+        [DisplayName("Character based")]
         public bool Chars { get; set; }
 
         public virtual ICollection<ResolutionsByGpu> ResolutionsByGpu { get; set; }
+
+        public long? PaletteView => Palette ?? Colors;
     }
 }

cicm_web/Areas/Admin/Controllers/ResolutionsController.cs

@@ -49,7 +49,9 @@ namespace cicm_web.Areas.Admin.Controllers
         }
 
         // GET: Admin/Resolutions
-        public async Task<IActionResult> Index() => View(await _context.Resolutions.ToListAsync());
+        public async Task<IActionResult> Index() =>
+            View(await _context.Resolutions.OrderBy(r => r.Chars).ThenBy(r => r.Width).ThenBy(r => r.Height)
+                               .ThenBy(r => r.Colors).ToListAsync());
 
         // GET: Admin/Resolutions/Details/5
         public async Task<IActionResult> Details(int? id)

cicm_web/Areas/Admin/Views/Resolutions/Create.cshtml

@@ -45,6 +45,26 @@
             <div asp-validation-summary="ModelOnly"
                  class="text-danger">
             </div>
+            <div class="form-group">
+                <label asp-for="Width"
+                       class="control-label">
+                </label>
+                <input asp-for="Width"
+                       class="form-control" />
+                <span asp-validation-for="Width"
+                      class="text-danger">
+                </span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Height"
+                       class="control-label">
+                </label>
+                <input asp-for="Height"
+                       class="form-control" />
+                <span asp-validation-for="Height"
+                      class="text-danger">
+                </span>
+            </div>
             <div class="form-group">
                 <label asp-for="Colors"
                        class="control-label">
@@ -65,6 +85,13 @@
                       class="text-danger">
                 </span>
             </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        <input asp-for="Chars" /> @Html.DisplayNameFor(model => model.Chars)
+                    </label>
+                </div>
+            </div>
             <div class="form-group">
                 <input class="btn btn-primary"
                        type="submit"

cicm_web/Areas/Admin/Views/Resolutions/Edit.cshtml

@@ -88,14 +88,11 @@
                 </span>
             </div>
             <div class="form-group">
-                <label asp-for="Chars"
+                <div class="checkbox">
-                       class="control-label">
+                    <label>
+                        <input asp-for="Chars" /> @Html.DisplayNameFor(model => model.Chars)
                     </label>
-                <input asp-for="Chars"
+                </div>
-                       class="form-control" />
-                <span asp-validation-for="Chars"
-                      class="text-danger">
-                </span>
             </div>
             <div class="form-group">
                 <input class="btn btn-primary"

cicm_web/Areas/Admin/Views/Resolutions/Index.cshtml

@@ -79,7 +79,7 @@
                 @Html.DisplayFor(modelItem => item.Colors)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Palette)
+                @Html.DisplayFor(modelItem => item.PaletteView)
             </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Chars)

cicm_web/cicm_web.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.449</Version>
+    <Version>3.0.99.450</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>