diff --git a/Cicm.Database/Models/Screen.cs b/Cicm.Database/Models/Screen.cs index 678d8f66..4bd40351 100644 --- a/Cicm.Database/Models/Screen.cs +++ b/Cicm.Database/Models/Screen.cs @@ -42,5 +42,8 @@ namespace Cicm.Database.Models public virtual ICollection ScreensByMachines { get; set; } [Required] public int NativeResolutionId { get; set; } + + public override string ToString() => + NativeResolution != null ? $"{Diagonal}\" {Type} at {NativeResolution}" : $"{Diagonal}\" {Type}"; } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs b/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs index bd096316..ce5049df 100644 --- a/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs +++ b/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs @@ -25,7 +25,8 @@ namespace cicm_web.Areas.Admin.Controllers { IIncludableQueryable cicmContext = _context.ResolutionsByScreen.Include(r => r.Resolution).Include(r => r.Screen); - return View(await cicmContext.ToListAsync()); + return View(await cicmContext.OrderBy(r => r.Screen.ToString()).ThenBy(r => r.Resolution.ToString()) + .ToListAsync()); } // GET: ResolutionsByScreen/Details/5 diff --git a/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml b/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml index e34c6980..83a100a9 100644 --- a/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml @@ -5,10 +5,13 @@ ViewData["Title"] = "Index"; } -

Index

+

Resolutions by screen

- Create New + + Create New +

@@ -33,16 +36,19 @@ @Html.DisplayFor(modelItem => item.Resolution.Id) diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index 5cb34413..421e898f 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.730 + 3.0.99.732 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website
- - Edit - | + asp-route-id="@item.Id" + class="btn btn-primary"> Details - | + + + Edit + + asp-route-id="@item.Id" + class="btn btn-danger"> Delete