From 535aeff6c769957c2602c0103ebc37ccc713ca44 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 2 Jun 2019 02:40:17 +0100
Subject: [PATCH] Implement create admin page for screens by machine.

---
 .../Controllers/ScreensByMachineController.cs | 49 ++++++++++++++++---
 .../Views/ScreensByMachine/Create.cshtml      | 20 +++++---
 cicm_web/cicm_web.csproj                      |  2 +-
 3 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs b/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
index 5a117e43..196e924d 100644
--- a/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
@@ -52,8 +52,14 @@ namespace cicm_web.Areas.Admin.Controllers
         // GET: ScreensByMachine/Create
         public IActionResult Create()
         {
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name");
-            ViewData["ScreenId"]  = new SelectList(_context.Screens,  "Id", "Type");
+            ViewData["MachineId"] =
+                new
+                    SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
+                               "Id", "Name");
+            ViewData["ScreenId"] =
+                new
+                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                               "Id", "Name");
             return View();
         }
 
@@ -71,8 +77,14 @@ namespace cicm_web.Areas.Admin.Controllers
                 return RedirectToAction(nameof(Index));
             }
 
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", screensByMachine.MachineId);
-            ViewData["ScreenId"]  = new SelectList(_context.Screens,  "Id", "Type", screensByMachine.ScreenId);
+            ViewData["MachineId"] =
+                new
+                    SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
+                               "Id", "Name", screensByMachine.MachineId);
+            ViewData["ScreenId"] =
+                new
+                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                               "Id", "Name", screensByMachine.ScreenId);
             return View(screensByMachine);
         }
 
@@ -84,8 +96,14 @@ namespace cicm_web.Areas.Admin.Controllers
             ScreensByMachine screensByMachine = await _context.ScreensByMachine.FindAsync(id);
             if(screensByMachine == null) return NotFound();
 
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", screensByMachine.MachineId);
-            ViewData["ScreenId"]  = new SelectList(_context.Screens,  "Id", "Type", screensByMachine.ScreenId);
+            ViewData["MachineId"] =
+                new
+                    SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
+                               "Id", "Name", screensByMachine.MachineId);
+            ViewData["ScreenId"] =
+                new
+                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                               "Id", "Name", screensByMachine.ScreenId);
             return View(screensByMachine);
         }
 
@@ -116,8 +134,14 @@ namespace cicm_web.Areas.Admin.Controllers
                 return RedirectToAction(nameof(Index));
             }
 
-            ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", screensByMachine.MachineId);
-            ViewData["ScreenId"]  = new SelectList(_context.Screens,  "Id", "Type", screensByMachine.ScreenId);
+            ViewData["MachineId"] =
+                new
+                    SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
+                               "Id", "Name", screensByMachine.MachineId);
+            ViewData["ScreenId"] =
+                new
+                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                               "Id", "Name", screensByMachine.ScreenId);
             return View(screensByMachine);
         }
 
@@ -150,5 +174,14 @@ namespace cicm_web.Areas.Admin.Controllers
         {
             return _context.ScreensByMachine.Any(e => e.Id == id);
         }
+
+        [AcceptVerbs("Get", "Post")]
+        public async Task<IActionResult> VerifyUnique(int screenId, int machineId)
+        {
+            return await _context.ScreensByMachine.FirstOrDefaultAsync(i => i.ScreenId  == screenId &&
+                                                                            i.MachineId == machineId) is null
+                       ? Json(true)
+                       : Json("The selected machine already has the selected screen.");
+        }
     }
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/ScreensByMachine/Create.cshtml b/cicm_web/Areas/Admin/Views/ScreensByMachine/Create.cshtml
index a4234632..a097b3f2 100644
--- a/cicm_web/Areas/Admin/Views/ScreensByMachine/Create.cshtml
+++ b/cicm_web/Areas/Admin/Views/ScreensByMachine/Create.cshtml
@@ -6,7 +6,7 @@
 
 <h1>Create</h1>
 
-<h4>ScreensByMachine</h4>
+<h4>Screens by machine</h4>
 <hr />
 <div class="row">
     <div class="col-md-4">
@@ -15,36 +15,42 @@
                  class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="ScreenId"
+                <label asp-for="Screen"
                        class="control-label">
                 </label>
                 <select asp-for="ScreenId"
                         class="form-control"
                         asp-items="ViewBag.ScreenId">
                 </select>
+                <span asp-validation-for="ScreenId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="MachineId"
+                <label asp-for="Machine"
                        class="control-label">
                 </label>
                 <select asp-for="MachineId"
                         class="form-control"
                         asp-items="ViewBag.MachineId">
                 </select>
+                <span asp-validation-for="MachineId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <input class="btn btn-primary"
                        type="submit"
                        value="Create" />
+                <a asp-action="Index"
+                   class="btn btn-secondary">
+                    Back to List
+                </a>
             </div>
         </form>
     </div>
 </div>
 
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
 @section Scripts {
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
 }
\ No newline at end of file
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index c14173a9..7375a594 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.744</Version>
+    <Version>3.0.99.747</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>