jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Held Devices

Browse Source
This commit is contained in:
Gary Sharp
2013-07-15 22:28:43 +10:00
parent aa54d93e8e
commit c19fd13c7b
2 changed files with 168 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml
+32 -4
View File
@@ -58,10 +58,24 @@
@item.DeviceSerialNumber @item.DeviceSerialNumber
</td> </td>
<td class="description"> <td class="description">
<span class="user">@item.UserDisplayName (@item.UserId)</span> @if (item.UserId != null)
{
<span class="user">@item.UserDisplayName (@item.UserId)</span>
}
@if (!string.IsNullOrWhiteSpace(item.DeviceLocation)) @if (!string.IsNullOrWhiteSpace(item.DeviceLocation))
{ {
<text> - </text>@item.DeviceLocation if (item.UserId != null)
{
<text> - </text>
}
@item.DeviceLocation
}
else
{
if (item.UserId == null)
{
@item.DeviceComputerName
}
} }
</td> </td>
<td class="timestamp@(item.IsAlert ? " Alert" : string.Empty)">Since @item.WaitingForUserActionSince <td class="timestamp@(item.IsAlert ? " Alert" : string.Empty)">Since @item.WaitingForUserActionSince
@@ -82,10 +96,24 @@
@item.DeviceSerialNumber @item.DeviceSerialNumber
</td> </td>
<td class="description"> <td class="description">
<span class="user">@item.UserDisplayName (@item.UserId)</span> @if (item.UserId != null)
{
<span class="user">@item.UserDisplayName (@item.UserId)</span>
}
@if (!string.IsNullOrWhiteSpace(item.DeviceLocation)) @if (!string.IsNullOrWhiteSpace(item.DeviceLocation))
{ {
<text> - </text>@item.DeviceLocation if (item.UserId != null)
{
<text> - </text>
}
@item.DeviceLocation
}
else
{
if (item.UserId == null)
{
@item.DeviceComputerName
}
} }
</td> </td>
<td class="timestamp@(item.IsAlert ? " Alert" : string.Empty)">Ready @item.ReadyForReturnSince <td class="timestamp@(item.IsAlert ? " Alert" : string.Empty)">Ready @item.ReadyForReturnSince
Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs
+130 -42
View File
@@ -337,15 +337,31 @@ WriteLiteral("\r\n </td>\r\n <td");
WriteLiteral(" class=\"description\""); WriteLiteral(" class=\"description\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n");
#line 61 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line default
#line hidden
#line 61 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
if (item.UserId != null)
{
#line default
#line hidden
WriteLiteral(" <span");
WriteLiteral(" class=\"user\""); WriteLiteral(" class=\"user\"");
WriteLiteral(">"); WriteLiteral(">");
#line 61 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 63 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.UserDisplayName); Write(item.UserDisplayName);
#line default #line default
@@ -353,8 +369,8 @@ WriteLiteral(">");
WriteLiteral(" ("); WriteLiteral(" (");
#line 61 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 63 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.UserId); Write(item.UserId);
#line default #line default
@@ -362,15 +378,20 @@ WriteLiteral(" (");
WriteLiteral(")</span>\r\n"); WriteLiteral(")</span>\r\n");
#line 62 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 64 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
}
#line default #line default
#line hidden #line hidden
WriteLiteral(" ");
#line 62 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line 65 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
if (!string.IsNullOrWhiteSpace(item.DeviceLocation)) if (!string.IsNullOrWhiteSpace(item.DeviceLocation))
{ {
if (item.UserId != null)
{
#line default #line default
@@ -379,44 +400,67 @@ WriteLiteral(" ");
WriteLiteral(" - "); WriteLiteral(" - ");
WriteLiteral("\r\n");
#line 64 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line 70 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
}
#line default #line default
#line hidden #line hidden
#line 64 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 71 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceLocation); Write(item.DeviceLocation);
#line default #line default
#line hidden #line hidden
#line 64 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 71 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
} }
else
{
if (item.UserId == null)
{
#line default
#line hidden
#line 77 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceComputerName);
#line default
#line hidden
#line 77 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
}
}
#line default #line default
#line hidden #line hidden
WriteLiteral(" </td>\r\n <td"); WriteLiteral(" </td>\r\n <td");
WriteAttribute("class", Tuple.Create(" class=\"", 2758), Tuple.Create("\"", 2816) WriteAttribute("class", Tuple.Create(" class=\"", 3267), Tuple.Create("\"", 3325)
, Tuple.Create(Tuple.Create("", 2766), Tuple.Create("timestamp", 2766), true) , Tuple.Create(Tuple.Create("", 3275), Tuple.Create("timestamp", 3275), true)
#line 67 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 81 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
, Tuple.Create(Tuple.Create("", 2775), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty , Tuple.Create(Tuple.Create("", 3284), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty
#line default #line default
#line hidden #line hidden
, 2775), false) , 3284), false)
); );
WriteLiteral(">Since "); WriteLiteral(">Since ");
#line 67 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 81 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.WaitingForUserActionSince); Write(item.WaitingForUserActionSince);
@@ -425,7 +469,7 @@ WriteLiteral(">Since ");
WriteLiteral("\r\n </td>\r\n </tr>\r\n"); WriteLiteral("\r\n </td>\r\n </tr>\r\n");
#line 70 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 84 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
} }
@@ -434,13 +478,13 @@ WriteLiteral("\r\n </td>\r\n </tr>\r\n");
WriteLiteral(" </table>\r\n <hr />\r\n"); WriteLiteral(" </table>\r\n <hr />\r\n");
#line 73 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 87 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 73 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 87 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
var DevicesReadyForReturn = Model.Where(i => i.ReadyForReturn && !i.WaitingForUserAction).ToArray(); var DevicesReadyForReturn = Model.Where(i => i.ReadyForReturn && !i.WaitingForUserAction).ToArray();
@@ -450,7 +494,7 @@ WriteLiteral(" </table>\r\n <hr />\r\n");
WriteLiteral("\r\n <h2>Ready for Return ("); WriteLiteral("\r\n <h2>Ready for Return (");
#line 76 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 90 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(DevicesReadyForReturn.Length); Write(DevicesReadyForReturn.Length);
@@ -463,13 +507,13 @@ WriteLiteral(" class=\"dataTable\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 78 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 92 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 78 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 92 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
foreach (var item in DevicesReadyForReturn) foreach (var item in DevicesReadyForReturn)
{ {
@@ -485,7 +529,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 82 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 96 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceSerialNumber); Write(item.DeviceSerialNumber);
@@ -495,15 +539,31 @@ WriteLiteral("\r\n </td>\r\n <td");
WriteLiteral(" class=\"description\""); WriteLiteral(" class=\"description\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n");
#line 99 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line default
#line hidden
#line 99 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
if (item.UserId != null)
{
#line default
#line hidden
WriteLiteral(" <span");
WriteLiteral(" class=\"user\""); WriteLiteral(" class=\"user\"");
WriteLiteral(">"); WriteLiteral(">");
#line 85 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 101 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.UserDisplayName); Write(item.UserDisplayName);
#line default #line default
@@ -511,8 +571,8 @@ WriteLiteral(">");
WriteLiteral(" ("); WriteLiteral(" (");
#line 85 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 101 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.UserId); Write(item.UserId);
#line default #line default
@@ -520,15 +580,20 @@ WriteLiteral(" (");
WriteLiteral(")</span>\r\n"); WriteLiteral(")</span>\r\n");
#line 86 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 102 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
}
#line default #line default
#line hidden #line hidden
WriteLiteral(" ");
#line 86 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line 103 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
if (!string.IsNullOrWhiteSpace(item.DeviceLocation)) if (!string.IsNullOrWhiteSpace(item.DeviceLocation))
{ {
if (item.UserId != null)
{
#line default #line default
@@ -537,44 +602,67 @@ WriteLiteral(" ");
WriteLiteral(" - "); WriteLiteral(" - ");
WriteLiteral("\r\n");
#line 88 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
#line 108 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
}
#line default #line default
#line hidden #line hidden
#line 88 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 109 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceLocation); Write(item.DeviceLocation);
#line default #line default
#line hidden #line hidden
#line 88 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 109 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
} }
else
{
if (item.UserId == null)
{
#line default
#line hidden
#line 115 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceComputerName);
#line default
#line hidden
#line 115 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
}
}
#line default #line default
#line hidden #line hidden
WriteLiteral(" </td>\r\n <td"); WriteLiteral(" </td>\r\n <td");
WriteAttribute("class", Tuple.Create(" class=\"", 3787), Tuple.Create("\"", 3845) WriteAttribute("class", Tuple.Create(" class=\"", 4805), Tuple.Create("\"", 4863)
, Tuple.Create(Tuple.Create("", 3795), Tuple.Create("timestamp", 3795), true) , Tuple.Create(Tuple.Create("", 4813), Tuple.Create("timestamp", 4813), true)
#line 91 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 119 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
, Tuple.Create(Tuple.Create("", 3804), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty , Tuple.Create(Tuple.Create("", 4822), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty
#line default #line default
#line hidden #line hidden
, 3804), false) , 4822), false)
); );
WriteLiteral(">Ready "); WriteLiteral(">Ready ");
#line 91 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 119 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.ReadyForReturnSince); Write(item.ReadyForReturnSince);
@@ -583,7 +671,7 @@ WriteLiteral(">Ready ");
WriteLiteral("\r\n </td>\r\n </tr>\r\n"); WriteLiteral("\r\n </td>\r\n </tr>\r\n");
#line 94 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" #line 122 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
} }