From d5ac537e53eedec5d1f9e7fc816f18b4447fc583 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sat, 18 May 2019 12:38:56 +0100
Subject: [PATCH] Fix storage by machines admin pages not showing type and
 interface.

---
 .../Views/StorageByMachines/Create.cshtml     | 59 +++++++++++++---
 .../Admin/Views/StorageByMachines/Edit.cshtml | 68 ++++++++++++++-----
 2 files changed, 99 insertions(+), 28 deletions(-)

diff --git a/cicm_web/Areas/Admin/Views/StorageByMachines/Create.cshtml b/cicm_web/Areas/Admin/Views/StorageByMachines/Create.cshtml
index 3813328d..dfd62516 100644
--- a/cicm_web/Areas/Admin/Views/StorageByMachines/Create.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByMachines/Create.cshtml
@@ -29,6 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
+@using Cicm.Database
 @model Cicm.Database.Models.StorageByMachine
 
 @{
@@ -42,18 +43,56 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Create">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="MachineId" class="control-label"></label>
-                <select asp-for="MachineId" class ="form-control" asp-items="ViewBag.MachineId"></select>
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="Capacity" class="control-label"></label>
-                <input asp-for="Capacity" class="form-control" />
-                <span asp-validation-for="Capacity" class="text-danger"></span>
+                <label asp-for="MachineId"
+                       class="control-label">
+                </label>
+                <select asp-for="MachineId"
+                        class="form-control"
+                        asp-items="ViewBag.MachineId">
+                </select>
             </div>
             <div class="form-group">
-                <input type="submit" value="Create" class="btn btn-default" />
+                <label asp-for="Type"
+                       class="control-label">
+                </label>
+                <select asp-for="Type"
+                        class="form-control"
+                        asp-items="Html.GetEnumSelectList<StorageType>().OrderBy(s => s.Text)">
+                </select>
+                <span asp-validation-for="Type"
+                      class="text-danger">
+                </span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Interface"
+                       class="control-label">
+                </label>
+                <select asp-for="Interface"
+                        class="form-control"
+                        asp-items="Html.GetEnumSelectList<StorageInterface>().OrderBy(s => s.Text)">
+                </select>
+                <span asp-validation-for="Interface"
+                      class="text-danger">
+                </span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Capacity"
+                       class="control-label">
+                </label>
+                <input asp-for="Capacity"
+                       class="form-control" />
+                <span asp-validation-for="Capacity"
+                      class="text-danger">
+                </span>
+            </div>
+            <div class="form-group">
+                <input class="btn btn-default"
+                       type="submit"
+                       value="Create" />
             </div>
         </form>
     </div>
@@ -64,5 +103,5 @@
 </div>
 
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml b/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml
index 1f453cb5..d89e601a 100644
--- a/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml
@@ -29,6 +29,7 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
+@using Cicm.Database
 @model Cicm.Database.Models.StorageByMachine
 
 @{
@@ -42,30 +43,61 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="MachineId" 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 asp-validation-summary="ModelOnly"
+                 class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control"></select>
-                <span asp-validation-for="Type" class="text-danger"></span>
+                <label asp-for="MachineId"
+                       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">
-                <label asp-for="Interface" class="control-label"></label>
-                <select asp-for="Interface" class="form-control"></select>
-                <span asp-validation-for="Interface" class="text-danger"></span>
+                <label asp-for="Type"
+                       class="control-label">
+                </label>
+                <select asp-for="Type"
+                        class="form-control"
+                        asp-items="Html.GetEnumSelectList<StorageType>().OrderBy(s => s.Text)">
+                </select>
+                <span asp-validation-for="Type"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Capacity" class="control-label"></label>
-                <input asp-for="Capacity" class="form-control" />
-                <span asp-validation-for="Capacity" class="text-danger"></span>
+                <label asp-for="Interface"
+                       class="control-label">
+                </label>
+                <select asp-for="Interface"
+                        class="form-control"
+                        asp-items="Html.GetEnumSelectList<StorageInterface>().OrderBy(s => s.Text)">
+                </select>
+                <span asp-validation-for="Interface"
+                      class="text-danger">
+                </span>
             </div>
-            <input type="hidden" asp-for="Id" />
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <label asp-for="Capacity"
+                       class="control-label">
+                </label>
+                <input asp-for="Capacity"
+                       class="form-control" />
+                <span asp-validation-for="Capacity"
+                      class="text-danger">
+                </span>
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
+            <div class="form-group">
+                <input class="btn btn-default"
+                       type="submit"
+                       value="Save" />
             </div>
         </form>
     </div>
@@ -76,5 +108,5 @@
 </div>
 
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file