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

Optimize view of instruction set extensions by processor admin page.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-19 23:37:58 +01:00
parent 60cdf6f98b
commit 4a58d8df7e
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cicm_web/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
View File

@@ -1,6 +1,7 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Cicm.Database.Models; using Cicm.Database.Models;
using cicm_web.Areas.Admin.Models;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Rendering;
@@ -26,7 +27,12 @@ namespace cicm_web.Areas.Admin.Controllers
IIncludableQueryable<InstructionSetExtensionsByProcessor, Processor> cicmContext = IIncludableQueryable<InstructionSetExtensionsByProcessor, Processor> cicmContext =
_context.InstructionSetExtensionsByProcessor.Include(i => i.Extension).Include(i => i.Processor); _context.InstructionSetExtensionsByProcessor.Include(i => i.Extension).Include(i => i.Processor);
return View(await cicmContext.OrderBy(e => e.Processor.Name).ThenBy(e => e.Extension.Extension) return View(await cicmContext.OrderBy(e => e.Processor.Name).ThenBy(e => e.Extension.Extension)
.ToListAsync()); .Select(e => new InstructionSetExtensionsByProcessorViewModel
{
Id = e.Id,
Extension = e.Extension.Extension,
Processor = e.Processor.Name
}).ToListAsync());
} }
// GET: InstructionSetExtensionsByProcessor/Details/5 // GET: InstructionSetExtensionsByProcessor/Details/5

3
cicm_web/Areas/Admin/Models/CompanyViewModel.cs
View File

@@ -16,7 +16,8 @@ namespace cicm_web.Areas.Admin.Models
[DisplayFormat(DataFormatString = "{0:d}")] [DisplayFormat(DataFormatString = "{0:d}")]
[DataType(DataType.Date)] [DataType(DataType.Date)]
public DateTime? Sold { get; set; } public DateTime? Sold { get; set; }
public string SoldTo { get; set; } [DisplayName("Sold to")]
public string SoldTo { get; set; }
public string Country { get; set; } public string Country { get; set; }
[Required] [Required]
public CompanyStatus Status { get; set; } public CompanyStatus Status { get; set; }

9
cicm_web/Areas/Admin/Models/InstructionSetExtensionsByProcessorViewModel.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace cicm_web.Areas.Admin.Models
{
public class InstructionSetExtensionsByProcessorViewModel
{
public string Extension;
public int Id;
public string Processor;
}
}

10
cicm_web/Areas/Admin/Views/InstructionSetExtensionsByProcessor/Index.cshtml
View File

@@ -1,5 +1,5 @@
@using Cicm.Database.Models @using cicm_web.Areas.Admin.Models
@model IEnumerable<Cicm.Database.Models.InstructionSetExtensionsByProcessor> @model IEnumerable<cicm_web.Areas.Admin.Models.InstructionSetExtensionsByProcessorViewModel>
@{ @{
ViewData["Title"] = "Index"; ViewData["Title"] = "Index";
@@ -26,14 +26,14 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach(InstructionSetExtensionsByProcessor item in Model) @foreach(InstructionSetExtensionsByProcessorViewModel item in Model)
{ {
<tr> <tr>
<td> <td>
@Html.DisplayFor(modelItem => item.Processor.Name) @Html.DisplayFor(modelItem => item.Processor)
</td> </td>
<td> <td>
@Html.DisplayFor(modelItem => item.Extension.Extension) @Html.DisplayFor(modelItem => item.Extension)
</td> </td>
<td> <td>
<a asp-action="Details" <a asp-action="Details"

2
cicm_web/cicm_web.csproj
View File

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