diff --git a/Cicm.Database/Models/BrowserTest.cs b/Cicm.Database/Models/BrowserTest.cs index fff2055c..b1984b94 100644 --- a/Cicm.Database/Models/BrowserTest.cs +++ b/Cicm.Database/Models/BrowserTest.cs @@ -28,26 +28,37 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ +using System.ComponentModel; + namespace Cicm.Database.Models { public class BrowserTest { - public int Id { get; set; } + public int Id { get; set; } + [DisplayName("User agent")] public string UserAgent { get; set; } - public string Browser { get; set; } - public string Version { get; set; } - public string Os { get; set; } - public string Platform { get; set; } - public bool Gif87 { get; set; } - public bool Gif89 { get; set; } - public bool Jpeg { get; set; } - public bool Png { get; set; } - public bool Pngt { get; set; } - public bool Agif { get; set; } - public bool Table { get; set; } - public bool Colors { get; set; } - public bool Js { get; set; } - public bool Frames { get; set; } - public bool Flash { get; set; } + public string Browser { get; set; } + public string Version { get; set; } + [DisplayName("Operating system")] + public string Os { get; set; } + public string Platform { get; set; } + [DisplayName("GIF87")] + public bool Gif87 { get; set; } + [DisplayName("GIF89")] + public bool Gif89 { get; set; } + [DisplayName("JPEG")] + public bool Jpeg { get; set; } + [DisplayName("PNG")] + public bool Png { get; set; } + [DisplayName("Transparent PNG")] + public bool Pngt { get; set; } + [DisplayName("Animated GIF")] + public bool Agif { get; set; } + public bool Table { get; set; } + public bool Colors { get; set; } + [DisplayName("JavaScript")] + public bool Js { get; set; } + public bool Frames { get; set; } + public bool Flash { get; set; } } } \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs b/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs index 858f9051..3b70387b 100644 --- a/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs +++ b/cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs @@ -49,7 +49,9 @@ namespace cicm_web.Areas.Admin.Controllers } // GET: Admin/BrowserTests - public async Task Index() => View(await _context.BrowserTests.ToListAsync()); + public async Task Index() => + View(await _context.BrowserTests.OrderBy(b => b.Browser).ThenBy(b => b.Version).ThenBy(b => b.Os) + .ThenBy(b => b.Platform).ThenBy(b => b.UserAgent).ToListAsync()); // GET: Admin/BrowserTests/Details/5 public async Task Details(int? id) diff --git a/cicm_web/Areas/Admin/Views/BrowserTests/Index.cshtml b/cicm_web/Areas/Admin/Views/BrowserTests/Index.cshtml index 249bb020..70dace73 100644 --- a/cicm_web/Areas/Admin/Views/BrowserTests/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/BrowserTests/Index.cshtml @@ -41,9 +41,6 @@ - @@ -56,6 +53,9 @@ + @@ -96,9 +96,6 @@ @foreach(BrowserTest item in Model) { - @@ -111,6 +108,9 @@ + diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index 56e63f94..d66424d1 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.397 + 3.0.99.398 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website
- @Html.DisplayNameFor(model => model.UserAgent) - @Html.DisplayNameFor(model => model.Browser) @Html.DisplayNameFor(model => model.Platform) + @Html.DisplayNameFor(model => model.UserAgent) + @Html.DisplayNameFor(model => model.Gif87)
- @Html.DisplayFor(modelItem => item.UserAgent) - @Html.DisplayFor(modelItem => item.Browser) @Html.DisplayFor(modelItem => item.Platform) + @Html.DisplayFor(modelItem => item.UserAgent) + @Html.DisplayFor(modelItem => item.Gif87)