diff --git a/Disco.Web/Views/Device/_DeviceTable.cshtml b/Disco.Web/Views/Device/_DeviceTable.cshtml index ddc8c6bf..3d2f8681 100644 --- a/Disco.Web/Views/Device/_DeviceTable.cshtml +++ b/Disco.Web/Views/Device/_DeviceTable.cshtml @@ -2,6 +2,8 @@ @{ var canShowDevices = Authorization.Has(Claims.Device.Show); var canShowUsers = Authorization.Has(Claims.User.Show); + + Html.BundleDeferred("~/ClientScripts/Modules/Disco-DataTableHelpers"); }
@if (Model != null && Model.Count() > 0) diff --git a/Disco.Web/Views/Device/_DeviceTable.generated.cs b/Disco.Web/Views/Device/_DeviceTable.generated.cs index dd67f9c3..73ab87b3 100644 --- a/Disco.Web/Views/Device/_DeviceTable.generated.cs +++ b/Disco.Web/Views/Device/_DeviceTable.generated.cs @@ -50,6 +50,8 @@ namespace Disco.Web.Views.Device var canShowDevices = Authorization.Has(Claims.Device.Show); var canShowUsers = Authorization.Has(Claims.User.Show); + Html.BundleDeferred("~/ClientScripts/Modules/Disco-DataTableHelpers"); + #line default #line hidden @@ -60,13 +62,13 @@ WriteLiteral(" class=\"genericData deviceTable\""); WriteLiteral(">\r\n"); - #line 7 "..\..\Views\Device\_DeviceTable.cshtml" + #line 9 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 7 "..\..\Views\Device\_DeviceTable.cshtml" + #line 9 "..\..\Views\Device\_DeviceTable.cshtml" if (Model != null && Model.Count() > 0) { @@ -102,13 +104,13 @@ WriteLiteral(@"> "); - #line 31 "..\..\Views\Device\_DeviceTable.cshtml" + #line 33 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 31 "..\..\Views\Device\_DeviceTable.cshtml" + #line 33 "..\..\Views\Device\_DeviceTable.cshtml" foreach (var item in Model) { @@ -117,40 +119,40 @@ WriteLiteral(@"> #line hidden WriteLiteral(" (item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty + #line 35 "..\..\Views\Device\_DeviceTable.cshtml" +, Tuple.Create(Tuple.Create("", 1109), Tuple.Create(item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty #line default #line hidden -, 1031), false) +, 1109), false) ); WriteLiteral(">\r\n \r\n"); - #line 35 "..\..\Views\Device\_DeviceTable.cshtml" + #line 37 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 35 "..\..\Views\Device\_DeviceTable.cshtml" + #line 37 "..\..\Views\Device\_DeviceTable.cshtml" if (canShowDevices) { #line default #line hidden - #line 36 "..\..\Views\Device\_DeviceTable.cshtml" + #line 38 "..\..\Views\Device\_DeviceTable.cshtml" Write(Html.ActionLink(item.Id, MVC.Device.Show(item.Id))); #line default #line hidden - #line 36 "..\..\Views\Device\_DeviceTable.cshtml" + #line 38 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -158,14 +160,14 @@ WriteLiteral(">\r\n \r\n"); #line default #line hidden - #line 38 "..\..\Views\Device\_DeviceTable.cshtml" + #line 40 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.Id); #line default #line hidden - #line 38 "..\..\Views\Device\_DeviceTable.cshtml" + #line 40 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -176,7 +178,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 41 "..\..\Views\Device\_DeviceTable.cshtml" + #line 43 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.AssetNumber); @@ -185,13 +187,13 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 42 "..\..\Views\Device\_DeviceTable.cshtml" + #line 44 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 42 "..\..\Views\Device\_DeviceTable.cshtml" + #line 44 "..\..\Views\Device\_DeviceTable.cshtml" if (item.DecommissionedDate.HasValue) { @@ -206,7 +208,7 @@ WriteLiteral(">(Decommissioned\r\n"); WriteLiteral(" "); - #line 44 "..\..\Views\Device\_DeviceTable.cshtml" + #line 46 "..\..\Views\Device\_DeviceTable.cshtml" Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value)); @@ -215,7 +217,7 @@ WriteLiteral(" "); WriteLiteral(") "); - #line 44 "..\..\Views\Device\_DeviceTable.cshtml" + #line 46 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -224,13 +226,13 @@ WriteLiteral(") "); WriteLiteral(" \r\n \r\n"); - #line 47 "..\..\Views\Device\_DeviceTable.cshtml" + #line 49 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 47 "..\..\Views\Device\_DeviceTable.cshtml" + #line 49 "..\..\Views\Device\_DeviceTable.cshtml" if (string.IsNullOrWhiteSpace(item.ComputerName)) { @@ -244,7 +246,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 50 "..\..\Views\Device\_DeviceTable.cshtml" + #line 52 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -253,14 +255,14 @@ WriteLiteral(">Unknown\r\n"); #line default #line hidden - #line 53 "..\..\Views\Device\_DeviceTable.cshtml" + #line 55 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.ComputerName); #line default #line hidden - #line 53 "..\..\Views\Device\_DeviceTable.cshtml" + #line 55 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -270,13 +272,13 @@ WriteLiteral(">Unknown\r\n"); WriteLiteral(" \r\n \r\n"); - #line 57 "..\..\Views\Device\_DeviceTable.cshtml" + #line 59 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 57 "..\..\Views\Device\_DeviceTable.cshtml" + #line 59 "..\..\Views\Device\_DeviceTable.cshtml" if (item.DeviceModelDescription != null) { @@ -286,7 +288,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 59 "..\..\Views\Device\_DeviceTable.cshtml" + #line 61 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.DeviceModelDescription); @@ -295,7 +297,7 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 60 "..\..\Views\Device\_DeviceTable.cshtml" + #line 62 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -310,7 +312,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown \r\n"); - #line 64 "..\..\Views\Device\_DeviceTable.cshtml" + #line 66 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -321,7 +323,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 67 "..\..\Views\Device\_DeviceTable.cshtml" + #line 69 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.DeviceProfileDescription); @@ -330,13 +332,13 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n \r\n"); - #line 70 "..\..\Views\Device\_DeviceTable.cshtml" + #line 72 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 70 "..\..\Views\Device\_DeviceTable.cshtml" + #line 72 "..\..\Views\Device\_DeviceTable.cshtml" if (item.DeviceBatchName != null) { @@ -346,7 +348,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 72 "..\..\Views\Device\_DeviceTable.cshtml" + #line 74 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.DeviceBatchName); @@ -355,7 +357,7 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 73 "..\..\Views\Device\_DeviceTable.cshtml" + #line 75 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -370,7 +372,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">N/A \r\n"); - #line 77 "..\..\Views\Device\_DeviceTable.cshtml" + #line 79 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -379,13 +381,13 @@ WriteLiteral(">N/A \r\n"); WriteLiteral(" \r\n \r\n"); - #line 80 "..\..\Views\Device\_DeviceTable.cshtml" + #line 82 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 80 "..\..\Views\Device\_DeviceTable.cshtml" + #line 82 "..\..\Views\Device\_DeviceTable.cshtml" if (string.IsNullOrEmpty(item.AssignedUserId)) { @@ -399,7 +401,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">N/A \r\n"); - #line 83 "..\..\Views\Device\_DeviceTable.cshtml" + #line 85 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -410,7 +412,7 @@ WriteLiteral(">N/A \r\n"); WriteLiteral(" "); - #line 86 "..\..\Views\Device\_DeviceTable.cshtml" + #line 88 "..\..\Views\Device\_DeviceTable.cshtml" if (canShowUsers) { @@ -418,14 +420,14 @@ WriteLiteral(" "); #line default #line hidden - #line 88 "..\..\Views\Device\_DeviceTable.cshtml" + #line 90 "..\..\Views\Device\_DeviceTable.cshtml" Write(Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId))); #line default #line hidden - #line 88 "..\..\Views\Device\_DeviceTable.cshtml" + #line 90 "..\..\Views\Device\_DeviceTable.cshtml" } else @@ -435,14 +437,14 @@ WriteLiteral(" "); #line default #line hidden - #line 92 "..\..\Views\Device\_DeviceTable.cshtml" + #line 94 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.AssignedUserDescription); #line default #line hidden - #line 92 "..\..\Views\Device\_DeviceTable.cshtml" + #line 94 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -452,7 +454,7 @@ WriteLiteral(" "); WriteLiteral(" \r\n"); - #line 95 "..\..\Views\Device\_DeviceTable.cshtml" + #line 97 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -463,7 +465,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 98 "..\..\Views\Device\_DeviceTable.cshtml" + #line 100 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.JobCount); @@ -472,7 +474,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n \r\n"); - #line 101 "..\..\Views\Device\_DeviceTable.cshtml" + #line 103 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -481,7 +483,7 @@ WriteLiteral("\r\n \r\n \r\n WriteLiteral(" \r\n \r\n"); - #line 104 "..\..\Views\Device\_DeviceTable.cshtml" + #line 106 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -496,7 +498,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Devices Found\r\n"); - #line 108 "..\..\Views\Device\_DeviceTable.cshtml" + #line 110 "..\..\Views\Device\_DeviceTable.cshtml" } diff --git a/Disco.Web/Views/User/_UserTable.cshtml b/Disco.Web/Views/User/_UserTable.cshtml index d0fb7a85..5badfc15 100644 --- a/Disco.Web/Views/User/_UserTable.cshtml +++ b/Disco.Web/Views/User/_UserTable.cshtml @@ -1,5 +1,8 @@ @model IEnumerable @using Disco.Services.Users.UserFlags; +@{ + Html.BundleDeferred("~/ClientScripts/Modules/Disco-DataTableHelpers"); +}
@if (Model != null && Model.Count() > 0) { diff --git a/Disco.Web/Views/User/_UserTable.generated.cs b/Disco.Web/Views/User/_UserTable.generated.cs index dad5fd47..e2f2df03 100644 --- a/Disco.Web/Views/User/_UserTable.generated.cs +++ b/Disco.Web/Views/User/_UserTable.generated.cs @@ -50,20 +50,28 @@ namespace Disco.Web.Views.User } public override void Execute() { -WriteLiteral("
"); - #line 43 "..\..\Views\User\_UserTable.cshtml" + #line 46 "..\..\Views\User\_UserTable.cshtml" } @@ -292,7 +300,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 46 "..\..\Views\User\_UserTable.cshtml" + #line 49 "..\..\Views\User\_UserTable.cshtml" Write(item.Surname); @@ -303,7 +311,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 49 "..\..\Views\User\_UserTable.cshtml" + #line 52 "..\..\Views\User\_UserTable.cshtml" Write(item.GivenName); @@ -314,7 +322,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 52 "..\..\Views\User\_UserTable.cshtml" + #line 55 "..\..\Views\User\_UserTable.cshtml" Write(item.DisplayName); @@ -325,7 +333,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 55 "..\..\Views\User\_UserTable.cshtml" + #line 58 "..\..\Views\User\_UserTable.cshtml" Write(item.AssignedDevicesCount); @@ -336,7 +344,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 58 "..\..\Views\User\_UserTable.cshtml" + #line 61 "..\..\Views\User\_UserTable.cshtml" Write(item.JobCountOpen); @@ -345,7 +353,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 58 "..\..\Views\User\_UserTable.cshtml" + #line 61 "..\..\Views\User\_UserTable.cshtml" if (item.JobCount > item.JobCountOpen) { @@ -359,7 +367,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">("); - #line 60 "..\..\Views\User\_UserTable.cshtml" + #line 63 "..\..\Views\User\_UserTable.cshtml" Write(item.JobCount - item.JobCountOpen); @@ -368,7 +376,7 @@ WriteLiteral(">("); WriteLiteral(" Closed)
\r\n"); - #line 61 "..\..\Views\User\_UserTable.cshtml" + #line 64 "..\..\Views\User\_UserTable.cshtml" } @@ -377,7 +385,7 @@ WriteLiteral(" Closed)
\r\n"); WriteLiteral(" \r\n \r\n"); - #line 64 "..\..\Views\User\_UserTable.cshtml" + #line 67 "..\..\Views\User\_UserTable.cshtml" } @@ -412,7 +420,7 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable " });\r\n \r\n"); - #line 106 "..\..\Views\User\_UserTable.cshtml" + #line 109 "..\..\Views\User\_UserTable.cshtml" } else { @@ -427,7 +435,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Users Found\r\n"); - #line 110 "..\..\Views\User\_UserTable.cshtml" + #line 113 "..\..\Views\User\_UserTable.cshtml" }