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

Update view to DB version 12.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-27 15:29:53 +01:00
parent d92ec59222
commit 56f54288eb
4 changed files with 225 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cicm_web/Models/Gpu.cs
View File

@@ -54,7 +54,7 @@ namespace cicm_web.Models
: new Gpu
{
Name = dbItem.Name,
Company = Company.GetItem(dbItem.Company.Id),
Company = dbItem.Company == null ? null : Company.GetItem(dbItem.Company.Id),
DieSize = dbItem.DieSize,
Introduced = dbItem.Introduced,
ModelCode = dbItem.ModelCode,
@@ -78,7 +78,7 @@ namespace cicm_web.Models
items.Add(new Gpu
{
Name = dbItem.Name,
Company = Company.GetItem(dbItem.Company.Id),
Company = dbItem.Company == null ? null : Company.GetItem(dbItem.Company.Id),
DieSize = dbItem.DieSize,
Introduced = dbItem.Introduced,
ModelCode = dbItem.ModelCode,

125
cicm_web/Views/Computer/View.cshtml
View File

@@ -608,27 +608,124 @@ else
}
}
</tr>
<tr>
<th scope=row>
<div align=right>
Graphics processor
</div>
</th>
@if(Model.Gpu == null || Model.Gpu != null && Model.Gpu.Id != -1)
{
<tr>
<th scope=row>
<div align=right>
Graphics processor
</div>
</th>
@if(Model.Gpu.Id > 1)
{
if(Model.Gpu.Id > 2)
@if(Model.Gpu != null)
{
<td>@Model.Gpu.Name</td>
if(Model.Gpu.Id == -2)
{
<td>
Framebuffer
<a aria-controls="gpuInfo"
aria-expanded="false"
class="btn btn-link"
data-toggle="collapse"
href="#gpuInfo">
+info
</a>
<div class="collapse"
id="gpuInfo">
<div class="card card-body">
This computer directly draws pixels from software to a memory region that's converted to video output by a <abbr title="Digital to Analog Converter">DAC</abbr> or similar without using any specific graphics processing unit.
</div>
</div>
</td>
}
else
{
<td>
@($"{Model.Gpu.Name}")
<a aria-controls="gpuInfo"
aria-expanded="false"
class="btn btn-link"
data-toggle="collapse"
href="#gpuInfo">
+info
</a>
<div class="collapse"
id="gpuInfo">
<div class="card card-body">
<table>
@if(Model.Gpu.ModelCode != null && Model.Gpu.ModelCode != Model.Gpu.Name)
{
<tr>
<td>Model</td>
<td>@Model.Gpu.ModelCode</td>
</tr>
}
<tr>
<td>Manufacturer</td>
<td>
<a asp-controller=Company
asp-action=View
asp-route-id=@Model.Gpu.Company.Id>
@Model.Gpu.Company.Name</a>
</td>
</tr>
@if(Model.Gpu.Introduced != DateTime.MinValue)
{
<tr>
<td>Introduction date</td>
<td>@($"{Model.Gpu.Introduced:yyyy}")</td>
</tr>
}
@if(Model.Gpu.Package != null)
{
<tr>
<td>Package</td>
<td>@Model.Gpu.Package</td>
</tr>
}
@if(Model.Gpu.Process != null || Model.Gpu.ProcessNm > 0)
{
<tr>
<td>Manufacturing process</td>
<td>
@if(Model.Gpu.Process != null && Model.Gpu.ProcessNm > 0)
{
@Model.Gpu.Process
@("@")
@(Model.Gpu.ProcessNm > 100 ? $"{Model.Gpu.ProcessNm / 100}µm" : $"{Model.Gpu.ProcessNm}nm")
}
else if(Model.Gpu.ProcessNm > 0) { @(Model.Gpu.ProcessNm > 100 ? $"{Model.Gpu.ProcessNm / 100}µm" : $"{Model.Gpu.ProcessNm}nm") }
else
{ @Model.Gpu.Process }
</td>
</tr>
}
@if(Model.Gpu.DieSize > 0)
{
<tr>
<td>Die size</td>
<td>@Model.Gpu.DieSize mm&sup2;</td>
</tr>
}
@if(Model.Gpu.Transistors > 0)
{
<tr>
<td>Transistors</td>
<td>@Model.Gpu.Transistors</td>
</tr>
}
</table>
</div>
</div>
</td>
}
}
else
{
<td>Unknown data</td>
}
}
else
{ <td>None</td> }
</tr>
</tr>
}
<tr>
<th scope=row>
<div align=right>

125
cicm_web/Views/Console/View.cshtml
View File

@@ -600,27 +600,124 @@ else
}
}
</tr>
<tr>
<th scope=row>
<div align=right>
Graphics processor
</div>
</th>
@if(Model.Gpu == null || Model.Gpu != null && Model.Gpu.Id != -1)
{
<tr>
<th scope=row>
<div align=right>
Graphics processor
</div>
</th>
@if(Model.Gpu.Id > 1)
{
if(Model.Gpu.Id > 2)
@if(Model.Gpu != null)
{
<td>@Model.Gpu.Name</td>
if(Model.Gpu.Id == -2)
{
<td>
Framebuffer
<a aria-controls="gpuInfo"
aria-expanded="false"
class="btn btn-link"
data-toggle="collapse"
href="#gpuInfo">
+info
</a>
<div class="collapse"
id="gpuInfo">
<div class="card card-body">
This videoconsole directly draws pixels from software to a memory region that's converted to video output by a <abbr title="Digital to Analog Converter">DAC</abbr> or similar without using any specific graphics processing unit.
</div>
</div>
</td>
}
else
{
<td>
@($"{Model.Gpu.Name}")
<a aria-controls="gpuInfo"
aria-expanded="false"
class="btn btn-link"
data-toggle="collapse"
href="#gpuInfo">
+info
</a>
<div class="collapse"
id="gpuInfo">
<div class="card card-body">
<table>
@if(Model.Gpu.ModelCode != null && Model.Gpu.ModelCode != Model.Gpu.Name)
{
<tr>
<td>Model</td>
<td>@Model.Gpu.ModelCode</td>
</tr>
}
<tr>
<td>Manufacturer</td>
<td>
<a asp-controller=Company
asp-action=View
asp-route-id=@Model.Gpu.Company.Id>
@Model.Gpu.Company.Name</a>
</td>
</tr>
@if(Model.Gpu.Introduced != DateTime.MinValue)
{
<tr>
<td>Introduction date</td>
<td>@($"{Model.Gpu.Introduced:yyyy}")</td>
</tr>
}
@if(Model.Gpu.Package != null)
{
<tr>
<td>Package</td>
<td>@Model.Gpu.Package</td>
</tr>
}
@if(Model.Gpu.Process != null || Model.Gpu.ProcessNm > 0)
{
<tr>
<td>Manufacturing process</td>
<td>
@if(Model.Gpu.Process != null && Model.Gpu.ProcessNm > 0)
{
@Model.Gpu.Process
@("@")
@(Model.Gpu.ProcessNm > 100 ? $"{Model.Gpu.ProcessNm / 100}µm" : $"{Model.Gpu.ProcessNm}nm")
}
else if(Model.Gpu.ProcessNm > 0) { @(Model.Gpu.ProcessNm > 100 ? $"{Model.Gpu.ProcessNm / 100}µm" : $"{Model.Gpu.ProcessNm}nm") }
else
{ @Model.Gpu.Process }
</td>
</tr>
}
@if(Model.Gpu.DieSize > 0)
{
<tr>
<td>Die size</td>
<td>@Model.Gpu.DieSize mm&sup2;</td>
</tr>
}
@if(Model.Gpu.Transistors > 0)
{
<tr>
<td>Transistors</td>
<td>@Model.Gpu.Transistors</td>
</tr>
}
</table>
</div>
</div>
</td>
}
}
else
{
<td>Unknown data</td>
}
}
else
{ <td>None</td> }
</tr>
</tr>
}
<tr>
<th scope=row>
<div align=right>

2
cicm_web/cicm_web.csproj
View File

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