From e8d80009221c6f9d794bd5d6bb674caa8ab232f1 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 2 Jun 2019 01:39:51 +0100
Subject: [PATCH] Implement index admin page for resolutions by screen.

---
 .../Admin/Controllers/ResolutionsByScreenController.cs    | 8 ++++----
 .../Areas/Admin/Views/ResolutionsByScreen/Index.cshtml    | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs b/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs
index de2a4076..f9e8d373 100644
--- a/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ResolutionsByScreenController.cs
@@ -50,7 +50,7 @@ namespace cicm_web.Areas.Admin.Controllers
                                "Id", "Name");
             ViewData["ScreenId"] =
                 new
-                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} at {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                    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();
         }
@@ -75,7 +75,7 @@ namespace cicm_web.Areas.Admin.Controllers
                                "Id", "Name", resolutionsByScreen.ResolutionId);
             ViewData["ScreenId"] =
                 new
-                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} at {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                    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", resolutionsByScreen.ScreenId);
             return View(resolutionsByScreen);
         }
@@ -93,7 +93,7 @@ namespace cicm_web.Areas.Admin.Controllers
                                "Id", "Name", resolutionsByScreen.ResolutionId);
             ViewData["ScreenId"] =
                 new
-                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} at {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                    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", resolutionsByScreen.ScreenId);
             return View(resolutionsByScreen);
         }
@@ -130,7 +130,7 @@ namespace cicm_web.Areas.Admin.Controllers
                                "Id", "Name", resolutionsByScreen.ResolutionId);
             ViewData["ScreenId"] =
                 new
-                    SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} at {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
+                    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", resolutionsByScreen.ScreenId);
             return View(resolutionsByScreen);
         }
diff --git a/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml b/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml
index 83a100a9..63c04426 100644
--- a/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/ResolutionsByScreen/Index.cshtml
@@ -30,10 +30,12 @@
     {
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.Screen.Type)
+                @if(item.Screen.NativeResolution != null) { @($"{item.Screen.Diagonal}\" {item.Screen.Type} with {item.Screen.NativeResolution}") }
+                else
+                { @($"{item.Screen.Diagonal}\" {item.Screen.Type}") }
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Resolution.Id)
+                @item.Resolution.ToString()
             </td>
             <td>
                 <a asp-action="Details"