Optimize view of sound synthetizers by machine admin page.

cicm_web/Areas/Admin/Controllers/SoundByMachineController.cs

@@ -1,10 +1,12 @@
 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;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace cicm_web.Areas.Admin.Controllers
 {
@@ -12,7 +14,7 @@ namespace cicm_web.Areas.Admin.Controllers
     [Authorize]
     public class SoundByMachineController : Controller
     {
-        private readonly cicmContext _context;
+        readonly cicmContext _context;
 
         public SoundByMachineController(cicmContext context)
         {
@@ -22,26 +24,26 @@ namespace cicm_web.Areas.Admin.Controllers
         // GET: SoundByMachine
         public async Task<IActionResult> Index()
         {
-            var cicmContext = _context.SoundByMachine.Include(s => s.Machine).Include(s => s.SoundSynth);
+            IIncludableQueryable<SoundByMachine, SoundSynth> cicmContext =
-            return View(await cicmContext.OrderBy(s => s.Machine.Name).ThenBy(s => s.SoundSynth.Name).ToListAsync());
+                _context.SoundByMachine.Include(s => s.Machine).Include(s => s.SoundSynth);
+            return View(await cicmContext.OrderBy(s => s.Machine.Name).ThenBy(s => s.SoundSynth.Name)
+                                         .Select(s => new SoundByMachineViewModel
+                                          {
+                                              Id         = s.Id,
+                                              Machine    = s.Machine.Name,
+                                              SoundSynth = s.SoundSynth.Name
+                                          }).ToListAsync());
         }
 
         // GET: SoundByMachine/Details/5
         public async Task<IActionResult> Details(long? id)
         {
-            if (id == null)
+            if(id == null) return NotFound();
-            {
-                return NotFound();
-            }
 
-            var soundByMachine = await _context.SoundByMachine
+            SoundByMachine soundByMachine = await _context.SoundByMachine
-                .Include(s => s.Machine)
+                                                          .Include(s => s.Machine).Include(s => s.SoundSynth)
-                .Include(s => s.SoundSynth)
+                                                          .FirstOrDefaultAsync(m => m.Id == id);
-                .FirstOrDefaultAsync(m => m.Id == id);
+            if(soundByMachine == null) return NotFound();
-            if (soundByMachine == null)
-            {
-                return NotFound();
-            }
 
             return View(soundByMachine);
         }
@@ -49,7 +51,7 @@ namespace cicm_web.Areas.Admin.Controllers
         // GET: SoundByMachine/Create
         public IActionResult Create()
         {
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name");
+            ViewData["MachineId"]    = new SelectList(_context.Machines,    "Id", "Name");
             ViewData["SoundSynthId"] = new SelectList(_context.SoundSynths, "Id", "Name");
             return View();
         }
@@ -61,13 +63,14 @@ namespace cicm_web.Areas.Admin.Controllers
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> Create([Bind("SoundSynthId,MachineId,Id")] SoundByMachine soundByMachine)
         {
-            if (ModelState.IsValid)
+            if(ModelState.IsValid)
             {
                 _context.Add(soundByMachine);
                 await _context.SaveChangesAsync();
                 return RedirectToAction(nameof(Index));
             }
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", soundByMachine.MachineId);
+
+            ViewData["MachineId"]    = new SelectList(_context.Machines,    "Id", "Name", soundByMachine.MachineId);
             ViewData["SoundSynthId"] = new SelectList(_context.SoundSynths, "Id", "Name", soundByMachine.SoundSynthId);
             return View(soundByMachine);
         }
@@ -75,17 +78,12 @@ namespace cicm_web.Areas.Admin.Controllers
         // GET: SoundByMachine/Edit/5
         public async Task<IActionResult> Edit(long? id)
         {
-            if (id == null)
+            if(id == null) return NotFound();
-            {
-                return NotFound();
-            }
 
-            var soundByMachine = await _context.SoundByMachine.FindAsync(id);
+            SoundByMachine soundByMachine = await _context.SoundByMachine.FindAsync(id);
-            if (soundByMachine == null)
+            if(soundByMachine == null) return NotFound();
-            {
+
-                return NotFound();
+            ViewData["MachineId"]    = new SelectList(_context.Machines,    "Id", "Name", soundByMachine.MachineId);
-            }
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", soundByMachine.MachineId);
             ViewData["SoundSynthId"] = new SelectList(_context.SoundSynths, "Id", "Name", soundByMachine.SoundSynthId);
             return View(soundByMachine);
         }
@@ -95,34 +93,29 @@ namespace cicm_web.Areas.Admin.Controllers
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(long id, [Bind("SoundSynthId,MachineId,Id")] SoundByMachine soundByMachine)
+        public async Task<IActionResult> Edit(
+            long id, [Bind("SoundSynthId,MachineId,Id")] SoundByMachine soundByMachine)
         {
-            if (id != soundByMachine.Id)
+            if(id != soundByMachine.Id) return NotFound();
-            {
-                return NotFound();
-            }
 
-            if (ModelState.IsValid)
+            if(ModelState.IsValid)
             {
                 try
                 {
                     _context.Update(soundByMachine);
                     await _context.SaveChangesAsync();
                 }
-                catch (DbUpdateConcurrencyException)
+                catch(DbUpdateConcurrencyException)
                 {
-                    if (!SoundByMachineExists(soundByMachine.Id))
+                    if(!SoundByMachineExists(soundByMachine.Id)) return NotFound();
-                    {
+
-                        return NotFound();
+                    throw;
-                    }
-                    else
-                    {
-                        throw;
-                    }
                 }
+
                 return RedirectToAction(nameof(Index));
             }
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", soundByMachine.MachineId);
+
+            ViewData["MachineId"]    = new SelectList(_context.Machines,    "Id", "Name", soundByMachine.MachineId);
             ViewData["SoundSynthId"] = new SelectList(_context.SoundSynths, "Id", "Name", soundByMachine.SoundSynthId);
             return View(soundByMachine);
         }
@@ -130,37 +123,31 @@ namespace cicm_web.Areas.Admin.Controllers
         // GET: SoundByMachine/Delete/5
         public async Task<IActionResult> Delete(long? id)
         {
-            if (id == null)
+            if(id == null) return NotFound();
-            {
-                return NotFound();
-            }
 
-            var soundByMachine = await _context.SoundByMachine
+            SoundByMachine soundByMachine = await _context.SoundByMachine
-                .Include(s => s.Machine)
+                                                          .Include(s => s.Machine).Include(s => s.SoundSynth)
-                .Include(s => s.SoundSynth)
+                                                          .FirstOrDefaultAsync(m => m.Id == id);
-                .FirstOrDefaultAsync(m => m.Id == id);
+            if(soundByMachine == null) return NotFound();
-            if (soundByMachine == null)
-            {
-                return NotFound();
-            }
 
             return View(soundByMachine);
         }
 
         // POST: SoundByMachine/Delete/5
-        [HttpPost, ActionName("Delete")]
+        [HttpPost]
+        [ActionName("Delete")]
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> DeleteConfirmed(long id)
         {
-            var soundByMachine = await _context.SoundByMachine.FindAsync(id);
+            SoundByMachine soundByMachine = await _context.SoundByMachine.FindAsync(id);
             _context.SoundByMachine.Remove(soundByMachine);
             await _context.SaveChangesAsync();
             return RedirectToAction(nameof(Index));
         }
 
-        private bool SoundByMachineExists(long id)
+        bool SoundByMachineExists(long id)
         {
             return _context.SoundByMachine.Any(e => e.Id == id);
         }
     }
-}
+}

cicm_web/Areas/Admin/Models/SoundByMachineViewModel.cs

@@ -0,0 +1,42 @@
+/******************************************************************************
+// Canary Islands Computer Museum Website
+// ----------------------------------------------------------------------------
+//
+// Filename       : SoundByMachine.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Junction of sound synth and machines.
+//
+// --[ 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 <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2003-2018 Natalia Portillo
+*******************************************************************************/
+
+using System.ComponentModel;
+
+namespace cicm_web.Areas.Admin.Models
+{
+    public class SoundByMachineViewModel
+    {
+        public long   Id;
+        public string Machine { get; set; }
+        [DisplayName("Sound synthetizer")]
+        public string SoundSynth { get; set; }
+    }
+}

cicm_web/Areas/Admin/Views/SoundByMachine/Index.cshtml

@@ -1,4 +1,5 @@
-@model IEnumerable<Cicm.Database.Models.SoundByMachine>
+@using cicm_web.Areas.Admin.Models
+@model IEnumerable<cicm_web.Areas.Admin.Models.SoundByMachineViewModel>
 
 @{
     ViewData["Title"] = "Index";
@@ -7,35 +8,51 @@
 <h1>Sound synthetizers by machine</h1>
 
 <p>
-    <a asp-action="Create" class="btn btn-primary">Create New</a>
+    <a asp-action="Create"
+       class="btn btn-primary">
+        Create New
+    </a>
 </p>
 <table class="table">
     <thead>
-        <tr>
+    <tr>
-            <th>
+        <th>
-                @Html.DisplayNameFor(model => model.Machine)
+            @Html.DisplayNameFor(model => model.Machine)
-            </th>
+        </th>
-            <th>
+        <th>
-                @Html.DisplayNameFor(model => model.SoundSynth)
+            @Html.DisplayNameFor(model => model.SoundSynth)
-            </th>
+        </th>
-            <th></th>
+        <th></th>
-        </tr>
+    </tr>
     </thead>
     <tbody>
-@foreach (var item in Model) {
+    @foreach(SoundByMachineViewModel item in Model)
+    {
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.Machine.Name)
+                @Html.DisplayFor(modelItem => item.Machine)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.SoundSynth.Name)
+                @Html.DisplayFor(modelItem => item.SoundSynth)
             </td>
             <td>
-                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Details"
-                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                   asp-route-id="@item.Id"
-                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+                   class="btn btn-primary">
+                    Details
+                </a>
+                <a asp-action="Edit"
+                   asp-route-id="@item.Id"
+                   class="btn btn-secondary">
+                    Edit
+                </a>
+                <a asp-action="Delete"
+                   asp-route-id="@item.Id"
+                   class="btn btn-danger">
+                    Delete
+                </a>
             </td>
         </tr>
-}
+    }
     </tbody>
-</table>
+</table>

cicm_web/cicm_web.csproj

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