diff --git a/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs b/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs index 20755d64..58afa01c 100644 --- a/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs +++ b/cicm_web/Areas/Admin/Controllers/MemoryByMachinesController.cs @@ -31,6 +31,7 @@ using System.Linq; using System.Threading.Tasks; using Cicm.Database.Models; +using cicm_web.Areas.Admin.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; @@ -56,7 +57,16 @@ namespace cicm_web.Areas.Admin.Controllers IIncludableQueryable cicmContext = _context.MemoryByMachine.Include(m => m.Machine); return View(await cicmContext.OrderBy(m => m.Machine.Name).ThenBy(m => m.Usage).ThenBy(m => m.Size) - .ThenBy(m => m.Type).ToListAsync()); + .ThenBy(m => m.Type) + .Select(m => new MemoryByMachineViewModel + { + Id = m.Id, + Machine = m.Machine.Name, + Size = m.Size, + Speed = m.Speed, + Type = m.Type, + Usage = m.Usage + }).ToListAsync()); } // GET: Admin/MemoryByMachines/Details/5 diff --git a/cicm_web/Areas/Admin/Models/MemoryByMachine.cs b/cicm_web/Areas/Admin/Models/MemoryByMachine.cs new file mode 100644 index 00000000..2ee5d810 --- /dev/null +++ b/cicm_web/Areas/Admin/Models/MemoryByMachine.cs @@ -0,0 +1,47 @@ +/****************************************************************************** +// Canary Islands Computer Museum Website +// ---------------------------------------------------------------------------- +// +// Filename : MemoryByMachine.cs +// Author(s) : Natalia Portillo +// +// --[ Description ] ---------------------------------------------------------- +// +// Junction between memory and machine. +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright © 2003-2018 Natalia Portillo +*******************************************************************************/ + +using System.ComponentModel; +using Cicm.Database; + +namespace cicm_web.Areas.Admin.Models +{ + public class MemoryByMachineViewModel + { + public long Id; + public MemoryType Type { get; set; } + public MemoryUsage Usage { get; set; } + public long? Size { get; set; } + [DisplayName("Speed (Hz)")] + public double? Speed { get; set; } + + public string Machine { get; set; } + } +} \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml index 9562988c..fe5e7666 100644 --- a/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/MemoryByMachines/Index.cshtml @@ -29,8 +29,8 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ } -@using Cicm.Database.Models -@model IEnumerable +@using cicm_web.Areas.Admin.Models +@model IEnumerable @{ ViewData["Title"] = "Memory by machines (Admin)"; @@ -66,11 +66,11 @@ - @foreach(MemoryByMachine item in Model) + @foreach(MemoryByMachineViewModel item in Model) { - @Html.DisplayFor(modelItem => item.Machine.Name) + @Html.DisplayFor(modelItem => item.Machine) @Html.DisplayFor(modelItem => item.Usage) diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index 537b0f3e..d81e2e2f 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.538 + 3.0.99.539 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website