Feature #26: User Flags
Flags can be associated with Users. Includes minor updates to Job Queues and improved visibility of user information.
This commit is contained in:
Gary Sharp
@@ -31,6 +31,12 @@ namespace Disco.Web.Views.User
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Services;
|
||||
using Disco.Services.Authorization;
|
||||
|
||||
#line 2 "..\..\Views\User\_UserTable.cshtml"
|
||||
using Disco.Services.Users.UserFlags;
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
using Disco.Services.Web;
|
||||
using Disco.Web;
|
||||
using Disco.Web.Extensions;
|
||||
@@ -51,13 +57,13 @@ WriteLiteral(" class=\"genericData userTable\"");
|
||||
WriteLiteral(">\r\n");
|
||||
|
||||
|
||||
#line 3 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 4 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 3 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 4 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (Model != null && Model.Count() > 0)
|
||||
{
|
||||
|
||||
@@ -89,13 +95,13 @@ WriteLiteral(@">
|
||||
");
|
||||
|
||||
|
||||
#line 23 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 24 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 23 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 24 "..\..\Views\User\_UserTable.cshtml"
|
||||
foreach (var item in Model)
|
||||
{
|
||||
|
||||
@@ -105,13 +111,13 @@ WriteLiteral(@">
|
||||
WriteLiteral(" <tr>\r\n <td>\r\n");
|
||||
|
||||
|
||||
#line 27 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 28 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 27 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 28 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (Authorization.Has(Claims.User.Show))
|
||||
{
|
||||
|
||||
@@ -119,15 +125,15 @@ WriteLiteral(" <tr>\r\n <td>\r\n");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 29 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(Html.ActionLink(item.Id, MVC.User.Show(item.Id)));
|
||||
#line 30 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(Html.ActionLink(item.FriendlyId, MVC.User.Show(item.Id)));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 29 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
#line 30 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -136,18 +142,149 @@ WriteLiteral(" <tr>\r\n <td>\r\n");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 33 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.Id);
|
||||
#line 34 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.FriendlyId);
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 33 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
#line 34 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 36 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (item.UserFlagAssignments != null && item.UserFlagAssignments.Count > 0)
|
||||
{
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("<div");
|
||||
|
||||
WriteLiteral(" class=\"flags\"");
|
||||
|
||||
WriteLiteral(">\r\n");
|
||||
|
||||
|
||||
#line 38 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 38 "..\..\Views\User\_UserTable.cshtml"
|
||||
foreach (var flag in item.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
|
||||
{
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" <i");
|
||||
|
||||
WriteAttribute("class", Tuple.Create(" class=\"", 1639), Tuple.Create("\"", 1709)
|
||||
, Tuple.Create(Tuple.Create("", 1647), Tuple.Create("flag", 1647), true)
|
||||
, Tuple.Create(Tuple.Create(" ", 1651), Tuple.Create("fa", 1652), true)
|
||||
, Tuple.Create(Tuple.Create(" ", 1654), Tuple.Create("fa-", 1655), true)
|
||||
|
||||
#line 40 "..\..\Views\User\_UserTable.cshtml"
|
||||
, Tuple.Create(Tuple.Create("", 1658), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
, 1658), false)
|
||||
, Tuple.Create(Tuple.Create(" ", 1676), Tuple.Create("fa-fw", 1677), true)
|
||||
, Tuple.Create(Tuple.Create(" ", 1682), Tuple.Create("d-", 1683), true)
|
||||
|
||||
#line 40 "..\..\Views\User\_UserTable.cshtml"
|
||||
, Tuple.Create(Tuple.Create("", 1685), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
, 1685), false)
|
||||
);
|
||||
|
||||
WriteLiteral("><span");
|
||||
|
||||
WriteLiteral(" class=\"details\"");
|
||||
|
||||
WriteLiteral("><span");
|
||||
|
||||
WriteLiteral(" class=\"name\"");
|
||||
|
||||
WriteLiteral(">");
|
||||
|
||||
|
||||
#line 40 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(flag.Item2.Name);
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("</span>");
|
||||
|
||||
|
||||
#line 40 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (flag.Item1.Comments != null)
|
||||
{
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("<span");
|
||||
|
||||
WriteLiteral(" class=\"comments\"");
|
||||
|
||||
WriteLiteral(">");
|
||||
|
||||
|
||||
#line 41 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("</span>");
|
||||
|
||||
|
||||
#line 41 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("<span");
|
||||
|
||||
WriteLiteral(" class=\"added\"");
|
||||
|
||||
WriteLiteral(">");
|
||||
|
||||
|
||||
#line 41 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("</span></span></i>\r\n");
|
||||
|
||||
|
||||
#line 42 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" </div>");
|
||||
|
||||
|
||||
#line 43 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" </td>\r\n <td>\r\n");
|
||||
@@ -155,7 +292,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 37 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 46 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.Surname);
|
||||
|
||||
|
||||
@@ -166,7 +303,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 40 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 49 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.GivenName);
|
||||
|
||||
|
||||
@@ -177,7 +314,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 43 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 52 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.DisplayName);
|
||||
|
||||
|
||||
@@ -188,7 +325,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 46 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.AssignedDevicesCount);
|
||||
|
||||
|
||||
@@ -199,16 +336,48 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 49 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.JobCount);
|
||||
#line 58 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.JobCountOpen);
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("\r\n </td>\r\n </tr>\r\n");
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 52 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 58 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (item.JobCount > item.JobCountOpen)
|
||||
{
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" <span");
|
||||
|
||||
WriteLiteral(" class=\"smallMessage\"");
|
||||
|
||||
WriteLiteral(">(");
|
||||
|
||||
|
||||
#line 60 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.JobCount - item.JobCountOpen);
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" Closed)</span>\r\n");
|
||||
|
||||
|
||||
#line 61 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(" </td>\r\n </tr>\r\n");
|
||||
|
||||
|
||||
#line 64 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -216,8 +385,34 @@ WriteLiteral("\r\n </td>\r\n </tr>\r\n
|
||||
#line hidden
|
||||
WriteLiteral(" </tbody>\r\n </table>\r\n");
|
||||
|
||||
WriteLiteral(" <script");
|
||||
|
||||
WriteLiteral(" type=\"text/javascript\"");
|
||||
|
||||
WriteLiteral(">\r\n $(function () {\r\n var userTable = $(\'table.userTabl" +
|
||||
"e\');\r\n\r\n userTable.each(function () {\r\n var $t" +
|
||||
"his = $(this);\r\n\r\n if (!$this.data(\'userTable_Flags\')) {\r\n " +
|
||||
" $this.tooltip({\r\n items: \'i.flag" +
|
||||
"\',\r\n content: function () {\r\n " +
|
||||
" var $this = $(this);\r\n return $this.child" +
|
||||
"ren(\'.details\').html();\r\n },\r\n " +
|
||||
" tooltipClass: \'User_FlagAssignment_Tooltip\',\r\n p" +
|
||||
"osition: {\r\n my: \"right top\",\r\n " +
|
||||
" at: \"right bottom\",\r\n collision: \"f" +
|
||||
"lipfit flip\"\r\n },\r\n hade: " +
|
||||
"{\r\n effect: \'\'\r\n },\r\n " +
|
||||
" close: function (e, ui) {\r\n " +
|
||||
" ui.tooltip.hover(\r\n function () {\r\n " +
|
||||
" $(this).stop(true).fadeTo(100, 1);\r\n " +
|
||||
" },\r\n function () " +
|
||||
"{\r\n $(this).fadeOut(100, function () { $(" +
|
||||
"this).remove(); });\r\n });\r\n " +
|
||||
" }\r\n });\r\n\r\n $this.data(\'" +
|
||||
"userTable_Flags\', true)\r\n }\r\n });\r\n " +
|
||||
" });\r\n </script>\r\n");
|
||||
|
||||
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 106 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -232,7 +427,7 @@ WriteLiteral(" class=\"smallMessage\"");
|
||||
WriteLiteral(">No Users Found</span>\r\n");
|
||||
|
||||
|
||||
#line 59 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 110 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user