claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort browser tests in admin page.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-18 15:20:28 +01:00
parent 559931515e
commit 379bc4ec5a
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Cicm.Database/Models/BrowserTest.cs
View File

@@ -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; }
}
}

4
cicm_web/Areas/Admin/Controllers/BrowserTestsController.cs
View File

@@ -49,7 +49,9 @@ namespace cicm_web.Areas.Admin.Controllers
}
// GET: Admin/BrowserTests
public async Task<IActionResult> Index() => View(await _context.BrowserTests.ToListAsync());
public async Task<IActionResult> 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<IActionResult> Details(int? id)

12
cicm_web/Areas/Admin/Views/BrowserTests/Index.cshtml
View File

@@ -41,9 +41,6 @@
<table class="table">
<thead>
<tr>
<th>
@Html.DisplayNameFor(model => model.UserAgent)
</th>
<th>
@Html.DisplayNameFor(model => model.Browser)
</th>
@@ -56,6 +53,9 @@
<th>
@Html.DisplayNameFor(model => model.Platform)
</th>
<th>
@Html.DisplayNameFor(model => model.UserAgent)
</th>
<th>
@Html.DisplayNameFor(model => model.Gif87)
</th>
@@ -96,9 +96,6 @@
@foreach(BrowserTest item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.UserAgent)
</td>
<td>
@Html.DisplayFor(modelItem => item.Browser)
</td>
@@ -111,6 +108,9 @@
<td>
@Html.DisplayFor(modelItem => item.Platform)
</td>
<td>
@Html.DisplayFor(modelItem => item.UserAgent)
</td>
<td>
@Html.DisplayFor(modelItem => item.Gif87)
</td>

2
cicm_web/cicm_web.csproj
View File

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