From f26474fa4d48e3ade2e226d7c55721a2373727af Mon Sep 17 00:00:00 2001
From: Gary Sharp <discoict@outlook.com>
Date: Thu, 7 Aug 2014 13:43:59 +1000
Subject: [PATCH] Device decommissioning 'returned' reason

---
 Disco.BI/BI/Extensions/DeviceExtensions.cs    |  2 ++
 .../Device/DeviceDecommissionReasons.cs       | 10 ++-----
 .../Views/Device/DeviceParts/_Subject.cshtml  |  4 +--
 .../Device/DeviceParts/_Subject.generated.cs  | 28 +++++++++----------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Disco.BI/BI/Extensions/DeviceExtensions.cs b/Disco.BI/BI/Extensions/DeviceExtensions.cs
index cbb6b1e7..532fa2b6 100644
--- a/Disco.BI/BI/Extensions/DeviceExtensions.cs
+++ b/Disco.BI/BI/Extensions/DeviceExtensions.cs
@@ -213,6 +213,8 @@ namespace Disco.BI.Extensions
                     return "Damaged";
                 case DecommissionReasons.Donated:
                     return "Donated";
+                case DecommissionReasons.Returned:
+                    return "Returned";
                 default:
                     return "Unknown";
             }
diff --git a/Disco.Models/Repository/Device/DeviceDecommissionReasons.cs b/Disco.Models/Repository/Device/DeviceDecommissionReasons.cs
index fe5a09cc..0ac0b33d 100644
--- a/Disco.Models/Repository/Device/DeviceDecommissionReasons.cs
+++ b/Disco.Models/Repository/Device/DeviceDecommissionReasons.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace Disco.Models.Repository
 {
     public enum DecommissionReasons
@@ -13,6 +8,7 @@ namespace Disco.Models.Repository
         Stolen = 20,
         Lost = 30,
         Damaged = 40,
-        Donated = 50
+        Donated = 50,
+        Returned = 60
     }
 }
diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
index 2af84930..837681dd 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
@@ -746,11 +746,11 @@
                 @Html.ActionLinkSmallButton("Decommission", MVC.API.Device.Decommission(), "Device_Show_Device_Actions_Decommission_Button")
                 <div id="Device_Show_Device_Actions_Decommission_Dialog" class="dialog" title="Device Decommissioning">
                     <div class="clearfix" style="margin-bottom: 10px;">
-                        <i class="fa fa-question-circle fa-lg information"></i>&nbsp;Why was this Device Decommissioned?
+                        <i class="fa fa-question-circle fa-lg information"></i>&nbsp;Why is this device to be decommissioned?
                     </div>
                     <div>
                         <ul class="none">
-                            @foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)))
+                            @foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)).Cast<DecommissionReasons>().OrderBy(r => r.ToString()))
                             {
                                 <li>
                                     <input type="radio" id="Device_Show_Device_Actions_Decommission_Reason_@((int)decommissionReason)"
diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
index ab097d06..c9577751 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
@@ -2497,8 +2497,8 @@ WriteLiteral(">\r\n                        <i");
 
 WriteLiteral(" class=\"fa fa-question-circle fa-lg information\"");
 
-WriteLiteral("></i>&nbsp;Why was this Device Decommissioned?\r\n                    </div>\r\n     " +
-"               <div>\r\n                        <ul");
+WriteLiteral("></i>&nbsp;Why is this device to be decommissioned?\r\n                    </div>\r\n" +
+"                    <div>\r\n                        <ul");
 
 WriteLiteral(" class=\"none\"");
 
@@ -2512,7 +2512,7 @@ WriteLiteral(">\r\n");
             #line hidden
             
             #line 753 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                             foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)))
+                             foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)).Cast<DecommissionReasons>().OrderBy(r => r.ToString()))
                             {
 
             
@@ -2522,28 +2522,28 @@ WriteLiteral("                                <li>\r\n
 
 WriteLiteral(" type=\"radio\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 47559), Tuple.Create("\"", 47637)
-, Tuple.Create(Tuple.Create("", 47564), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 47564), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 47619), Tuple.Create("\"", 47697)
+, Tuple.Create(Tuple.Create("", 47624), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 47624), true)
             
             #line 756 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                           , Tuple.Create(Tuple.Create("", 47611), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+                           , Tuple.Create(Tuple.Create("", 47671), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 47611), false)
+, 47671), false)
 );
 
 WriteLiteral("\r\n                                        name=\"Device_Show_Device_Actions_Decomm" +
 "ission_Reason\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 47733), Tuple.Create("\"", 47767)
+WriteAttribute("value", Tuple.Create(" value=\"", 47793), Tuple.Create("\"", 47827)
             
             #line 757 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                     , Tuple.Create(Tuple.Create("", 47741), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+                     , Tuple.Create(Tuple.Create("", 47801), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 47741), false)
+, 47801), false)
 );
 
 WriteLiteral(" ");
@@ -2557,15 +2557,15 @@ WriteLiteral(" ");
             #line hidden
 WriteLiteral("/>\r\n                                    <label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 47910), Tuple.Create("\"", 47989)
-, Tuple.Create(Tuple.Create("", 47916), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 47916), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 47970), Tuple.Create("\"", 48049)
+, Tuple.Create(Tuple.Create("", 47976), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 47976), true)
             
             #line 758 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-               , Tuple.Create(Tuple.Create("", 47963), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+               , Tuple.Create(Tuple.Create("", 48023), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 47963), false)
+, 48023), false)
 );
 
 WriteLiteral(">");