From 8bedb56cb7665b08a6fd2eb661793a3355d951b7 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sat, 18 May 2019 20:28:51 +0100
Subject: [PATCH] Annotate GPU fields.

---
 Cicm.Database/Models/Gpu.cs                   | 28 ++++++++++++-------
 cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml |  2 +-
 .../Areas/Admin/Views/Gpus/Details.cshtml     | 27 +++++++++++-------
 cicm_web/Areas/Admin/Views/Gpus/Index.cshtml  |  2 +-
 cicm_web/cicm_web.csproj                      |  2 +-
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/Cicm.Database/Models/Gpu.cs b/Cicm.Database/Models/Gpu.cs
index 15860bae..ff4fc9cd 100644
--- a/Cicm.Database/Models/Gpu.cs
+++ b/Cicm.Database/Models/Gpu.cs
@@ -31,6 +31,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Cicm.Database.Models
 {
@@ -42,19 +44,25 @@ namespace Cicm.Database.Models
             ResolutionsByGpu = new HashSet<ResolutionsByGpu>();
         }
 
-        public int       Id          { get; set; }
-        public string    Name        { get; set; }
-        public int?      CompanyId   { get; set; }
-        public string    ModelCode   { get; set; }
-        public DateTime? Introduced  { get; set; }
-        public string    Package     { get; set; }
-        public string    Process     { get; set; }
-        public float?    ProcessNm   { get; set; }
-        public float?    DieSize     { get; set; }
-        public long?     Transistors { get; set; }
+        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; }
+        public string    Package    { 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; }
 
         public virtual Company                       Company          { get; set; }
         public virtual ICollection<GpusByMachine>    GpusByMachine    { get; set; }
         public virtual ICollection<ResolutionsByGpu> ResolutionsByGpu { get; set; }
+
+        [NotMapped]
+        public string IntroducedView => Introduced?.ToShortDateString() ?? "Unknown";
     }
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml
index 487b487f..fa99874c 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml
@@ -64,7 +64,7 @@
             @Html.DisplayNameFor(model => model.Introduced)
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.Introduced)
+            @Html.DisplayFor(model => model.IntroducedView)
         </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Package)
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml
index 8be65538..7279f86a 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml
@@ -41,6 +41,12 @@
     <h4>GPU</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>
@@ -57,7 +63,7 @@
             @Html.DisplayNameFor(model => model.Introduced)
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.Introduced)
+            @Html.DisplayFor(model => model.IntroducedView)
         </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Package)
@@ -89,15 +95,16 @@
         <dd>
             @Html.DisplayFor(model => model.Transistors)
         </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.Company)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Company.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>
-</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>
+</div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
index 4fdf67aa..8adfa518 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
@@ -76,7 +76,7 @@
                 @Html.DisplayFor(modelItem => item.ModelCode)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Introduced)
+                @Html.DisplayFor(modelItem => item.IntroducedView)
             </td>
             <td>
                 <a asp-action="Details"
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index fefe8cae..fa5ccfd5 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.431</Version>
+    <Version>3.0.99.432</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>