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 processors in admin page.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-19 00:59:40 +01:00
parent 86470c6bca
commit 0e6fc2e7f2
8 changed files with 244 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Cicm.Database/Models/Processor.cs
View File

@@ -31,6 +31,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations.Schema;
namespace Cicm.Database.Models
{
@@ -45,33 +47,55 @@ namespace Cicm.Database.Models
public int Id { get; set; }
public string Name { get; set; }
public int? CompanyId { get; set; }
[DisplayName("Model code")]
public string ModelCode { get; set; }
public DateTime? Introduced { get; set; }
[DisplayName("Instruction set")]
public int? InstructionSetId { get; set; }
[DisplayName("Nominal speed (MHz)")]
public double? Speed { get; set; }
public string Package { get; set; }
[DisplayName("General Purpose Registers")]
public int? Gprs { get; set; }
[DisplayName("General Purporse Register size")]
public int? GprSize { get; set; }
[DisplayName("Floating Point Registers")]
public int? Fprs { get; set; }
[DisplayName("Floating Point Register Size")]
public int? FprSize { get; set; }
public int? Cores { get; set; }
[DisplayName("Threads per core")]
public int? ThreadsPerCore { get; set; }
public string Process { get; set; }
[DisplayName("Process (nm)")]
public float? ProcessNm { get; set; }
[DisplayName("Die size (mm²)")]
public float? DieSize { get; set; }
public long? Transistors { get; set; }
[DisplayName("Data bus size")]
public int? DataBus { get; set; }
[DisplayName("Address bus size")]
public int? AddrBus { get; set; }
[DisplayName("SIMD registers")]
public int? SimdRegisters { get; set; }
[DisplayName("SIMD register size")]
public int? SimdSize { get; set; }
[DisplayName("L1 instruction cache (KiB)")]
public float? L1Instruction { get; set; }
[DisplayName("L1 data cache (KiB)")]
public float? L1Data { get; set; }
[DisplayName("L2 cache (KiB)")]
public float? L2 { get; set; }
[DisplayName("L3 cache (KiB)")]
public float? L3 { get; set; }
public virtual Company Company { get; set; }
[DisplayName("Instruction set")]
public virtual InstructionSet InstructionSet { get; set; }
public virtual ICollection<InstructionSetExtensionsByProcessor> InstructionSetExtensions { get; set; }
public virtual ICollection<ProcessorsByMachine> ProcessorsByMachine { get; set; }
[NotMapped]
public string IntroducedView => Introduced?.ToShortDateString() ?? "Unknown";
}
}

2
cicm_web/Areas/Admin/Controllers/ProcessorsController.cs
View File

@@ -55,7 +55,7 @@ namespace cicm_web.Areas.Admin.Controllers
{
IIncludableQueryable<Processor, InstructionSet> cicmContext =
_context.Processors.Include(p => p.Company).Include(p => p.InstructionSet);
return View(await cicmContext.ToListAsync());
return View(await cicmContext.OrderBy(p => p.Company.Name).ThenBy(p => p.Name).ToListAsync());
}
// GET: Admin/Processors/Details/5

92
cicm_web/Areas/Admin/Views/Processors/Create.cshtml
View File

@@ -46,7 +46,7 @@
class="text-danger">
</div>
<div class="form-group">
<label asp-for="CompanyId"
<label asp-for="Company"
class="control-label">
</label>
<select asp-for="CompanyId"
@@ -54,6 +54,16 @@
asp-items="ViewBag.CompanyId">
</select>
</div>
<div class="form-group">
<label asp-for="Name"
class="control-label">
</label>
<input asp-for="Name"
class="form-control" />
<span asp-validation-for="Name"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="ModelCode"
class="control-label">
@@ -103,46 +113,6 @@
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Gprs"
class="control-label">
</label>
<input asp-for="Gprs"
class="form-control" />
<span asp-validation-for="Gprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="GprSize"
class="control-label">
</label>
<input asp-for="GprSize"
class="form-control" />
<span asp-validation-for="GprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Fprs"
class="control-label">
</label>
<input asp-for="Fprs"
class="form-control" />
<span asp-validation-for="Fprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="FprSize"
class="control-label">
</label>
<input asp-for="FprSize"
class="form-control" />
<span asp-validation-for="FprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Cores"
class="control-label">
@@ -223,6 +193,46 @@
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Gprs"
class="control-label">
</label>
<input asp-for="Gprs"
class="form-control" />
<span asp-validation-for="Gprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="GprSize"
class="control-label">
</label>
<input asp-for="GprSize"
class="form-control" />
<span asp-validation-for="GprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Fprs"
class="control-label">
</label>
<input asp-for="Fprs"
class="form-control" />
<span asp-validation-for="Fprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="FprSize"
class="control-label">
</label>
<input asp-for="FprSize"
class="form-control" />
<span asp-validation-for="FprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="SimdRegisters"
class="control-label">

72
cicm_web/Areas/Admin/Views/Processors/Delete.cshtml
View File

@@ -42,6 +42,12 @@
<h4>Processor</h4>
<hr />
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.Company)
</dt>
<dd>
@Html.DisplayFor(model => model.Company.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Name)
</dt>
@@ -60,6 +66,12 @@
<dd>
@Html.DisplayFor(model => model.Introduced)
</dd>
<dt>
@Html.DisplayNameFor(model => model.InstructionSet)
</dt>
<dd>
@Html.DisplayFor(model => model.InstructionSet.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Speed)
</dt>
@@ -72,30 +84,6 @@
<dd>
@Html.DisplayFor(model => model.Package)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Gprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Gprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.GprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.GprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Fprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Fprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.FprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.FprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Cores)
</dt>
@@ -144,6 +132,30 @@
<dd>
@Html.DisplayFor(model => model.AddrBus)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Gprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Gprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.GprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.GprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Fprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Fprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.FprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.FprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.SimdRegisters)
</dt>
@@ -180,18 +192,6 @@
<dd>
@Html.DisplayFor(model => model.L3)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Company)
</dt>
<dd>
@Html.DisplayFor(model => model.Company.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.InstructionSet)
</dt>
<dd>
@Html.DisplayFor(model => model.InstructionSet.Name)
</dd>
</dl>
<form asp-action="Delete">

83
cicm_web/Areas/Admin/Views/Processors/Details.cshtml
View File

@@ -41,6 +41,12 @@
<h4>Processor</h4>
<hr />
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.Company)
</dt>
<dd>
@Html.DisplayFor(model => model.Company.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Name)
</dt>
@@ -59,6 +65,12 @@
<dd>
@Html.DisplayFor(model => model.Introduced)
</dd>
<dt>
@Html.DisplayNameFor(model => model.InstructionSet)
</dt>
<dd>
@Html.DisplayFor(model => model.InstructionSet.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Speed)
</dt>
@@ -71,30 +83,6 @@
<dd>
@Html.DisplayFor(model => model.Package)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Gprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Gprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.GprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.GprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Fprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Fprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.FprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.FprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Cores)
</dt>
@@ -143,6 +131,30 @@
<dd>
@Html.DisplayFor(model => model.AddrBus)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Gprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Gprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.GprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.GprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Fprs)
</dt>
<dd>
@Html.DisplayFor(model => model.Fprs)
</dd>
<dt>
@Html.DisplayNameFor(model => model.FprSize)
</dt>
<dd>
@Html.DisplayFor(model => model.FprSize)
</dd>
<dt>
@Html.DisplayNameFor(model => model.SimdRegisters)
</dt>
@@ -179,21 +191,16 @@
<dd>
@Html.DisplayFor(model => model.L3)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Company)
</dt>
<dd>
@Html.DisplayFor(model => model.Company.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.InstructionSet)
</dt>
<dd>
@Html.DisplayFor(model => model.InstructionSet.Name)
</dd>
</dl>
</div>
<div>
<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
<a asp-action="Index" class="btn btn-secondary">Back to List</a>
<a asp-action="Edit"
asp-route-id="@Model.Id"
class="btn btn-primary">
Edit
</a>
<a asp-action="Index"
class="btn btn-secondary">
Back to List
</a>
</div>

106
cicm_web/Areas/Admin/Views/Processors/Edit.cshtml
View File

@@ -48,24 +48,21 @@
<input type="hidden"
asp-for="Id" />
<div class="form-group">
<label asp-for="Name"
class="control-label">
</label>
<input asp-for="Name"
class="form-control" />
<span asp-validation-for="Name"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="CompanyId"
<label asp-for="Company"
class="control-label">
</label>
<select asp-for="CompanyId"
class="form-control"
asp-items="ViewBag.CompanyId">
</select>
<span asp-validation-for="CompanyId"
</div>
<div class="form-group">
<label asp-for="Name"
class="control-label">
</label>
<input asp-for="Name"
class="form-control" />
<span asp-validation-for="Name"
class="text-danger">
</span>
</div>
@@ -97,9 +94,6 @@
class="form-control"
asp-items="ViewBag.InstructionSetId">
</select>
<span asp-validation-for="InstructionSetId"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Speed"
@@ -121,46 +115,6 @@
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Gprs"
class="control-label">
</label>
<input asp-for="Gprs"
class="form-control" />
<span asp-validation-for="Gprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="GprSize"
class="control-label">
</label>
<input asp-for="GprSize"
class="form-control" />
<span asp-validation-for="GprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Fprs"
class="control-label">
</label>
<input asp-for="Fprs"
class="form-control" />
<span asp-validation-for="Fprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="FprSize"
class="control-label">
</label>
<input asp-for="FprSize"
class="form-control" />
<span asp-validation-for="FprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Cores"
class="control-label">
@@ -241,6 +195,46 @@
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Gprs"
class="control-label">
</label>
<input asp-for="Gprs"
class="form-control" />
<span asp-validation-for="Gprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="GprSize"
class="control-label">
</label>
<input asp-for="GprSize"
class="form-control" />
<span asp-validation-for="GprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Fprs"
class="control-label">
</label>
<input asp-for="Fprs"
class="form-control" />
<span asp-validation-for="Fprs"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="FprSize"
class="control-label">
</label>
<input asp-for="FprSize"
class="form-control" />
<span asp-validation-for="FprSize"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="SimdRegisters"
class="control-label">
@@ -304,7 +298,7 @@
<div class="form-group">
<input class="btn btn-primary"
type="submit"
value="Save" />
value="Create" />
<a asp-action="Index"
class="btn btn-secondary">
Back to List

134
cicm_web/Areas/Admin/Views/Processors/Index.cshtml
View File

@@ -47,6 +47,9 @@
<table class="table">
<thead>
<tr>
<th>
@Html.DisplayNameFor(model => model.Company)
</th>
<th>
@Html.DisplayNameFor(model => model.Name)
</th>
@@ -56,69 +59,6 @@
<th>
@Html.DisplayNameFor(model => model.Introduced)
</th>
<th>
@Html.DisplayNameFor(model => model.Speed)
</th>
<th>
@Html.DisplayNameFor(model => model.Package)
</th>
<th>
@Html.DisplayNameFor(model => model.Gprs)
</th>
<th>
@Html.DisplayNameFor(model => model.GprSize)
</th>
<th>
@Html.DisplayNameFor(model => model.Fprs)
</th>
<th>
@Html.DisplayNameFor(model => model.FprSize)
</th>
<th>
@Html.DisplayNameFor(model => model.Cores)
</th>
<th>
@Html.DisplayNameFor(model => model.ThreadsPerCore)
</th>
<th>
@Html.DisplayNameFor(model => model.Process)
</th>
<th>
@Html.DisplayNameFor(model => model.ProcessNm)
</th>
<th>
@Html.DisplayNameFor(model => model.DieSize)
</th>
<th>
@Html.DisplayNameFor(model => model.Transistors)
</th>
<th>
@Html.DisplayNameFor(model => model.DataBus)
</th>
<th>
@Html.DisplayNameFor(model => model.AddrBus)
</th>
<th>
@Html.DisplayNameFor(model => model.SimdRegisters)
</th>
<th>
@Html.DisplayNameFor(model => model.SimdSize)
</th>
<th>
@Html.DisplayNameFor(model => model.L1Instruction)
</th>
<th>
@Html.DisplayNameFor(model => model.L1Data)
</th>
<th>
@Html.DisplayNameFor(model => model.L2)
</th>
<th>
@Html.DisplayNameFor(model => model.L3)
</th>
<th>
@Html.DisplayNameFor(model => model.Company)
</th>
<th>
@Html.DisplayNameFor(model => model.InstructionSet)
</th>
@@ -129,6 +69,9 @@
@foreach(Processor item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Company.Name)
</td>
<td>
@Html.DisplayFor(modelItem => item.Name)
</td>
@@ -136,70 +79,7 @@
@Html.DisplayFor(modelItem => item.ModelCode)
</td>
<td>
@Html.DisplayFor(modelItem => item.Introduced)
</td>
<td>
@Html.DisplayFor(modelItem => item.Speed)
</td>
<td>
@Html.DisplayFor(modelItem => item.Package)
</td>
<td>
@Html.DisplayFor(modelItem => item.Gprs)
</td>
<td>
@Html.DisplayFor(modelItem => item.GprSize)
</td>
<td>
@Html.DisplayFor(modelItem => item.Fprs)
</td>
<td>
@Html.DisplayFor(modelItem => item.FprSize)
</td>
<td>
@Html.DisplayFor(modelItem => item.Cores)
</td>
<td>
@Html.DisplayFor(modelItem => item.ThreadsPerCore)
</td>
<td>
@Html.DisplayFor(modelItem => item.Process)
</td>
<td>
@Html.DisplayFor(modelItem => item.ProcessNm)
</td>
<td>
@Html.DisplayFor(modelItem => item.DieSize)
</td>
<td>
@Html.DisplayFor(modelItem => item.Transistors)
</td>
<td>
@Html.DisplayFor(modelItem => item.DataBus)
</td>
<td>
@Html.DisplayFor(modelItem => item.AddrBus)
</td>
<td>
@Html.DisplayFor(modelItem => item.SimdRegisters)
</td>
<td>
@Html.DisplayFor(modelItem => item.SimdSize)
</td>
<td>
@Html.DisplayFor(modelItem => item.L1Instruction)
</td>
<td>
@Html.DisplayFor(modelItem => item.L1Data)
</td>
<td>
@Html.DisplayFor(modelItem => item.L2)
</td>
<td>
@Html.DisplayFor(modelItem => item.L3)
</td>
<td>
@Html.DisplayFor(modelItem => item.Company.Name)
@Html.DisplayFor(modelItem => item.IntroducedView)
</td>
<td>
@Html.DisplayFor(modelItem => item.InstructionSet.Name)

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.445</Version>
<Version>3.0.99.446</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>