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

#138 display device flags where appropriate in the UI

Browse Source
This commit is contained in:
Gary Sharp
2024-01-14 19:13:09 +11:00
parent aee467cb53
commit 5f4cb20900
31 changed files with 2236 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Models/Services/Searching/DeviceSearchResultItem.cs
+3 -1
View File
@@ -1,4 +1,5 @@
using System;
using Disco.Models.Repository;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -44,6 +45,7 @@ namespace Disco.Models.Services.Searching
public string DeviceBatchName { get; set; }
public int JobCount { get; set; }
public DateTime? DecommissionedDate { get; set; }
public IList<DeviceFlagAssignment> DeviceFlagAssignments { get; set; }
private string[] BuildScoreValues()
{
Disco.Services/Searching/Search.cs
+2 -1
View File
@@ -323,7 +323,8 @@ namespace Disco.Services.Searching
DecommissionedDate = d.DecommissionedDate,
AssignedUserId = d.AssignedUserId,
AssignedUserDisplayName = d.AssignedUser.DisplayName,
JobCount = d.Jobs.Count()
JobCount = d.Jobs.Count(),
DeviceFlagAssignments = d.DeviceFlagAssignments,
}).ToList();
}
#endregion
Disco.Web/ClientSource/Style/BundleSite.css
+9 -6
View File
@@ -5209,14 +5209,17 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none;
}
table.userTable div.flags {
table.userTable div.flags,
table.deviceTable div.flags {
display: inline-block;
float: right;
}
table.userTable div.flags > i {
table.userTable div.flags > i,
table.deviceTable div.flags > i {
cursor: default;
}
table.userTable div.flags > i > .details {
table.userTable div.flags > i > .details,
table.deviceTable div.flags > i > .details {
display: none;
}
.jobStatus {
@@ -5689,15 +5692,15 @@ div.Disco-AttachmentUpload-ImageDialog {
background-color: #000 !important;
padding: 0 !important;
}
body > .User_FlagAssignment_Tooltip span.name {
body > .FlagAssignment_Tooltip span.name {
display: block;
font-weight: 600;
}
body > .User_FlagAssignment_Tooltip span.comments {
body > .FlagAssignment_Tooltip span.comments {
display: block;
padding: 2px 0 2px 4px;
}
body > .User_FlagAssignment_Tooltip span.added {
body > .FlagAssignment_Tooltip span.added {
font-style: italic;
font-size: 0.9em;
}
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Device.css
+12
View File
@@ -91,6 +91,18 @@
#layout_PageHeading #Device_Show_Status span.icon {
margin-right: 6px;
}
#layout_PageHeading #Device_Show_Flags {
display: inline-block;
float: right;
height: 50px;
font-size: 0.6em;
}
#layout_PageHeading #Device_Show_Flags > i {
cursor: default;
}
#layout_PageHeading #Device_Show_Flags > i > .details {
display: none;
}
#Device_Show #Device_Show_Subjects {
table-layout: fixed;
}
Disco.Web/ClientSource/Style/Device.less
+16
View File
@@ -18,6 +18,21 @@
margin-right: 6px;
}
}
#Device_Show_Flags {
display: inline-block;
float: right;
height: 50px;
font-size: 0.6em;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
#Device_Show {
@@ -188,6 +203,7 @@
}
}
}
.enforce-ou {
padding-top: .5em;
}
Disco.Web/ClientSource/Style/Device.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Job.css
+10
View File
@@ -185,6 +185,16 @@
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details {
float: left;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Flags {
margin: 4px 0;
font-size: 16px;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Flags > i {
cursor: default;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Flags > i > .details {
display: none;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HWar,
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HNWar {
float: right;
Disco.Web/ClientSource/Style/Job.less
+13
View File
@@ -143,6 +143,19 @@
float: left;
}
#Job_Show_Device_Flags {
margin: 4px 0;
font-size: 16px;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
#Job_Show_Device_Details_HWar, #Job_Show_Device_Details_HNWar {
float: right;
border-left: 1px dashed #ddd;
Disco.Web/ClientSource/Style/Job.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Site.css
+9 -6
View File
@@ -777,14 +777,17 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none;
}
table.userTable div.flags {
table.userTable div.flags,
table.deviceTable div.flags {
display: inline-block;
float: right;
}
table.userTable div.flags > i {
table.userTable div.flags > i,
table.deviceTable div.flags > i {
cursor: default;
}
table.userTable div.flags > i > .details {
table.userTable div.flags > i > .details,
table.deviceTable div.flags > i > .details {
display: none;
}
.jobStatus {
@@ -1257,15 +1260,15 @@ div.Disco-AttachmentUpload-ImageDialog {
background-color: #000 !important;
padding: 0 !important;
}
body > .User_FlagAssignment_Tooltip span.name {
body > .FlagAssignment_Tooltip span.name {
display: block;
font-weight: 600;
}
body > .User_FlagAssignment_Tooltip span.comments {
body > .FlagAssignment_Tooltip span.comments {
display: block;
padding: 2px 0 2px 4px;
}
body > .User_FlagAssignment_Tooltip span.added {
body > .FlagAssignment_Tooltip span.added {
font-style: italic;
font-size: 0.9em;
}
Disco.Web/ClientSource/Style/Site.less
+2 -2
View File
@@ -746,7 +746,7 @@ table.genericData {
}
}
table.userTable {
table.userTable, table.deviceTable {
div.flags {
display: inline-block;
float: right;
@@ -1275,7 +1275,7 @@ div.Disco-AttachmentUpload-ImageDialog {
padding: 0 !important;
}
body > .User_FlagAssignment_Tooltip {
body > .FlagAssignment_Tooltip {
span.name {
display: block;
font-weight: @FontWeightBodyBold;
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/User.css
+9
View File
@@ -152,6 +152,15 @@
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment div.User_Show_AssignedDevices_CurrentAssignment_Details {
float: left;
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment .User_Show_Assigned_Devices_CurrentAssignment_Flags {
font-size: 16px;
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment .User_Show_Assigned_Devices_CurrentAssignment_Flags > i {
cursor: default;
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment .User_Show_Assigned_Devices_CurrentAssignment_Flags > i > .details {
display: none;
}
#User_Show #User_Show_Subjects #User_Show_Subjects_Actions > td {
padding-top: 4px;
}
Disco.Web/ClientSource/Style/User.less
+12
View File
@@ -103,6 +103,18 @@
div.User_Show_AssignedDevices_CurrentAssignment_Details {
float: left;
}
.User_Show_Assigned_Devices_CurrentAssignment_Flags {
font-size: 16px;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
}
Disco.Web/ClientSource/Style/User.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Controllers/JobController.cs
+18 -15
View File
@@ -18,6 +18,7 @@ using Disco.Services.Web;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Linq;
using System.Web.Mvc;
@@ -298,21 +299,23 @@ namespace Disco.Web.Controllers
var m = new Models.Job.ShowModel();
m.Job = Database.Jobs
.Include("Device.DeviceModel")
.Include("Device.DeviceBatch")
.Include("Device.DeviceDetails")
.Include("DeviceHeldTechUser")
.Include("DeviceReadyForReturnTechUser")
.Include("DeviceReturnedTechUser")
.Include("OpenedTechUser")
.Include("ClosedTechUser")
.Include("JobType")
.Include("JobSubTypes")
.Include("User.UserFlagAssignments")
.Include("User.UserDetails")
.Include("JobLogs.TechUser")
.Include("JobAttachments.TechUser")
.Include("JobAttachments.DocumentTemplate")
.Include(j => j.Device.DeviceModel)
.Include(j => j.Device.DeviceBatch)
.Include(j => j.Device.DeviceProfile)
.Include(j => j.Device.DeviceDetails)
.Include(j => j.Device.DeviceFlagAssignments)
.Include(j => j.DeviceHeldTechUser)
.Include(j => j.DeviceReadyForReturnTechUser)
.Include(j => j.DeviceReturnedTechUser)
.Include(j => j.OpenedTechUser)
.Include(j => j.ClosedTechUser)
.Include(j => j.JobType)
.Include(j => j.JobSubTypes)
.Include(j => j.User.UserFlagAssignments)
.Include(j => j.User.UserDetails)
.Include(j => j.JobLogs.Select(l => l.TechUser))
.Include(j => j.JobAttachments.Select(a => a.TechUser))
.Include(j => j.JobAttachments.Select(a => a.DocumentTemplate))
.FirstOrDefault(j => j.Id == id.Value);
if (m.Job == null)
Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+1 -1
View File
@@ -249,7 +249,7 @@
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'User_FlagAssignment_Tooltip',
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
+72 -72
View File
@@ -1178,28 +1178,28 @@ WriteLiteral(">\r\n $(functio
"(this);\r\n ret" +
"urn $this.children(\'.details\').html();\r\n " +
" },\r\n " +
" tooltipClass: \'User_FlagAssignment_Tooltip\',\r\n " +
" position: {\r\n " +
" my: \"right top\",\r\n " +
" at: \"right bottom\",\r\n " +
" collision: \"flipfit fl" +
"ip\"\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 " +
" $(thi" +
"s).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 " +
" </script>\r\n </div>\r\n");
" tooltipClass: \'FlagAssignment_Tooltip\',\r\n " +
" position: {\r\n " +
" my: \"right top\",\r\n " +
" at: \"right bottom\",\r\n " +
" collision: \"flipfit 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).st" +
"op(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 </s" +
"cript>\r\n </div>\r\n");
#line 274 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
@@ -1707,27 +1707,27 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 25472), Tuple.Create("\"", 25517)
WriteAttribute("class", Tuple.Create(" class=\"", 25467), Tuple.Create("\"", 25512)
#line 400 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 25480), Tuple.Create<System.Object, System.Int32>(isDecommissioned ? "hidden" : null
, Tuple.Create(Tuple.Create("", 25475), Tuple.Create<System.Object, System.Int32>(isDecommissioned ? "hidden" : null
#line default
#line hidden
, 25480), false)
, 25475), false)
);
WriteLiteral(">\r\n <label");
WriteAttribute("title", Tuple.Create(" title=\"", 25575), Tuple.Create("\"", 25619)
, Tuple.Create(Tuple.Create("", 25583), Tuple.Create("Distribution:", 25583), true)
WriteAttribute("title", Tuple.Create(" title=\"", 25570), Tuple.Create("\"", 25614)
, Tuple.Create(Tuple.Create("", 25578), Tuple.Create("Distribution:", 25578), true)
#line 401 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create(" ", 25596), Tuple.Create<System.Object, System.Int32>(dp.DistributionType
, Tuple.Create(Tuple.Create(" ", 25591), Tuple.Create<System.Object, System.Int32>(dp.DistributionType
#line default
#line hidden
, 25597), false)
, 25592), false)
);
WriteLiteral(">\r\n <input");
@@ -1736,14 +1736,14 @@ WriteLiteral(" type=\"radio\"");
WriteLiteral(" name=\"DeviceProfileId\"");
WriteAttribute("value", Tuple.Create(" value=\"", 25717), Tuple.Create("\"", 25731)
WriteAttribute("value", Tuple.Create(" value=\"", 25712), Tuple.Create("\"", 25726)
#line 402 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 25725), Tuple.Create<System.Object, System.Int32>(dp.Id
, Tuple.Create(Tuple.Create("", 25720), Tuple.Create<System.Object, System.Int32>(dp.Id
#line default
#line hidden
, 25725), false)
, 25720), false)
);
WriteLiteral(" data-ouenforced=\"");
@@ -2062,14 +2062,14 @@ WriteLiteral(" title=\"Warranty Valid Until\"");
WriteLiteral(">Warranty Until:</span>\r\n </td>\r\n " +
" <td");
WriteAttribute("class", Tuple.Create(" class=\"", 33479), Tuple.Create("\"", 33627)
WriteAttribute("class", Tuple.Create(" class=\"", 33474), Tuple.Create("\"", 33622)
#line 523 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 33487), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null
, Tuple.Create(Tuple.Create("", 33482), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null
#line default
#line hidden
, 33487), false)
, 33482), false)
);
WriteLiteral(">\r\n");
@@ -2110,14 +2110,14 @@ WriteLiteral(" title=\"Insured Until\"");
WriteLiteral(">Insured Until:</span>\r\n </td>\r\n " +
" <td");
WriteAttribute("class", Tuple.Create(" class=\"", 34481), Tuple.Create("\"", 34617)
WriteAttribute("class", Tuple.Create(" class=\"", 34476), Tuple.Create("\"", 34612)
#line 539 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 34489), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null
, Tuple.Create(Tuple.Create("", 34484), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null
#line default
#line hidden
, 34489), false)
, 34484), false)
);
WriteLiteral(">\r\n");
@@ -2208,27 +2208,27 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 35808), Tuple.Create("\"", 35853)
WriteAttribute("class", Tuple.Create(" class=\"", 35803), Tuple.Create("\"", 35848)
#line 559 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 35816), Tuple.Create<System.Object, System.Int32>(isDecommissioned ? "hidden" : null
, Tuple.Create(Tuple.Create("", 35811), Tuple.Create<System.Object, System.Int32>(isDecommissioned ? "hidden" : null
#line default
#line hidden
, 35816), false)
, 35811), false)
);
WriteLiteral(">\r\n <label");
WriteAttribute("title", Tuple.Create(" title=\"", 35907), Tuple.Create("\"", 35963)
, Tuple.Create(Tuple.Create("", 35915), Tuple.Create("Purchased:", 35915), true)
WriteAttribute("title", Tuple.Create(" title=\"", 35902), Tuple.Create("\"", 35958)
, Tuple.Create(Tuple.Create("", 35910), Tuple.Create("Purchased:", 35910), true)
#line 560 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create(" ", 35925), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToLongDateString()
, Tuple.Create(Tuple.Create(" ", 35920), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToLongDateString()
#line default
#line hidden
, 35926), false)
, 35921), false)
);
WriteLiteral(">\r\n <input");
@@ -2461,14 +2461,14 @@ WriteLiteral(" id=\"Device_Show_Aspects_Model_Image\"");
WriteLiteral(" alt=\"Model Image\"");
WriteAttribute("src", Tuple.Create(" src=\"", 42170), Tuple.Create("\"", 42280)
WriteAttribute("src", Tuple.Create(" src=\"", 42165), Tuple.Create("\"", 42275)
#line 658 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 42176), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
, Tuple.Create(Tuple.Create("", 42171), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
#line default
#line hidden
, 42176), false)
, 42171), false)
);
WriteLiteral(" />\r\n </div>\r\n </div>\r\n </td>\r\n </tr>\r\n <t" +
@@ -2756,14 +2756,14 @@ WriteLiteral(" type=\"hidden\"");
WriteLiteral(" name=\"DeviceSerialNumber\"");
WriteAttribute("value", Tuple.Create(" value=\"", 48128), Tuple.Create("\"", 48162)
WriteAttribute("value", Tuple.Create(" value=\"", 48123), Tuple.Create("\"", 48157)
#line 761 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 48136), Tuple.Create<System.Object, System.Int32>(Model.Device.SerialNumber
, Tuple.Create(Tuple.Create("", 48131), Tuple.Create<System.Object, System.Int32>(Model.Device.SerialNumber
#line default
#line hidden
, 48136), false)
, 48131), false)
);
WriteLiteral(" />\r\n");
@@ -2805,26 +2805,26 @@ WriteLiteral("\"");
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 48466), Tuple.Create("\"", 48525)
, Tuple.Create(Tuple.Create("", 48474), Tuple.Create("fa", 48474), true)
, Tuple.Create(Tuple.Create(" ", 48476), Tuple.Create("fa-", 48477), true)
WriteAttribute("class", Tuple.Create(" class=\"", 48461), Tuple.Create("\"", 48520)
, Tuple.Create(Tuple.Create("", 48469), Tuple.Create("fa", 48469), true)
, Tuple.Create(Tuple.Create(" ", 48471), Tuple.Create("fa-", 48472), true)
#line 766 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 48480), Tuple.Create<System.Object, System.Int32>(flag.Icon
, Tuple.Create(Tuple.Create("", 48475), Tuple.Create<System.Object, System.Int32>(flag.Icon
#line default
#line hidden
, 48480), false)
, Tuple.Create(Tuple.Create(" ", 48492), Tuple.Create("fa-fw", 48493), true)
, Tuple.Create(Tuple.Create(" ", 48498), Tuple.Create("fa-lg", 48499), true)
, Tuple.Create(Tuple.Create(" ", 48504), Tuple.Create("d-", 48505), true)
, 48475), false)
, Tuple.Create(Tuple.Create(" ", 48487), Tuple.Create("fa-fw", 48488), true)
, Tuple.Create(Tuple.Create(" ", 48493), Tuple.Create("fa-lg", 48494), true)
, Tuple.Create(Tuple.Create(" ", 48499), Tuple.Create("d-", 48500), true)
#line 766 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 48507), Tuple.Create<System.Object, System.Int32>(flag.IconColour
, Tuple.Create(Tuple.Create("", 48502), Tuple.Create<System.Object, System.Int32>(flag.IconColour
#line default
#line hidden
, 48507), false)
, 48502), false)
);
WriteLiteral("></i>");
@@ -3191,28 +3191,28 @@ WriteLiteral(" <li>\r\n
WriteLiteral(" type=\"radio\"");
WriteAttribute("id", Tuple.Create(" id=\"", 58686), Tuple.Create("\"", 58764)
, Tuple.Create(Tuple.Create("", 58691), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 58691), true)
WriteAttribute("id", Tuple.Create(" id=\"", 58681), Tuple.Create("\"", 58759)
, Tuple.Create(Tuple.Create("", 58686), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 58686), true)
#line 952 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 58738), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
, Tuple.Create(Tuple.Create("", 58733), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
#line default
#line hidden
, 58738), false)
, 58733), false)
);
WriteLiteral("\r\n name=\"Device_Show_Device_Actions_Dec" +
"ommission_Reason\"");
WriteAttribute("value", Tuple.Create(" value=\"", 58863), Tuple.Create("\"", 58897)
WriteAttribute("value", Tuple.Create(" value=\"", 58858), Tuple.Create("\"", 58892)
#line 953 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 58871), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
, Tuple.Create(Tuple.Create("", 58866), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
#line default
#line hidden
, 58871), false)
, 58866), false)
);
WriteLiteral(" ");
@@ -3226,15 +3226,15 @@ WriteLiteral(" ");
#line hidden
WriteLiteral(" />\r\n <label");
WriteAttribute("for", Tuple.Create(" for=\"", 59041), Tuple.Create("\"", 59120)
, Tuple.Create(Tuple.Create("", 59047), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 59047), true)
WriteAttribute("for", Tuple.Create(" for=\"", 59036), Tuple.Create("\"", 59115)
, Tuple.Create(Tuple.Create("", 59042), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 59042), true)
#line 954 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 59094), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
, Tuple.Create(Tuple.Create("", 59089), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
#line default
#line hidden
, 59094), false)
, 59089), false)
);
WriteLiteral(">");
Disco.Web/Views/Device/Show.cshtml
+46
View File
@@ -1,4 +1,5 @@
@model Disco.Web.Models.Device.ShowModel
@using Disco.Services.Devices.DeviceFlags;
@{
ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), string.Format("Device: {0}", Model.Device.SerialNumber));
}
@@ -11,6 +12,51 @@
});
</script>
</div>
@if (Authorization.Has(Claims.Device.ShowFlagAssignments))
{
<div id="Device_Show_Flags">
@foreach (var flag in Model.Device.DeviceFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, DeviceFlagService.GetDeviceFlag(f.DeviceFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw fa-lg d-@(flag.Item2.IconColour)">
<span class="details">
<span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span>
</span>
</i>
}
</div>
<script type="text/javascript">
$(function () {
$('#Device_Show_Flags')
.appendTo('#layout_PageHeading')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
collision: "flipfit flip"
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
}
@Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model)
<script type="text/javascript">
$(function () {
Disco.Web/Views/Device/Show.generated.cs
+209 -29
View File
@@ -30,6 +30,12 @@ namespace Disco.Web.Views.Device
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
#line 2 "..\..\Views\Device\Show.cshtml"
using Disco.Services.Devices.DeviceFlags;
#line default
#line hidden
using Disco.Services.Web;
using Disco.Web;
using Disco.Web.Extensions;
@@ -44,7 +50,7 @@ namespace Disco.Web.Views.Device
public override void Execute()
{
#line 2 "..\..\Views\Device\Show.cshtml"
#line 3 "..\..\Views\Device\Show.cshtml"
ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), string.Format("Device: {0}", Model.Device.SerialNumber));
@@ -61,23 +67,23 @@ WriteLiteral(" id=\"Device_Show_Status\"");
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 246), Tuple.Create("\"", 308)
, Tuple.Create(Tuple.Create("", 254), Tuple.Create("fa", 254), true)
, Tuple.Create(Tuple.Create(" ", 256), Tuple.Create("fa-square", 257), true)
, Tuple.Create(Tuple.Create(" ", 266), Tuple.Create("deviceStatus", 267), true)
WriteAttribute("class", Tuple.Create(" class=\"", 290), Tuple.Create("\"", 352)
, Tuple.Create(Tuple.Create("", 298), Tuple.Create("fa", 298), true)
, Tuple.Create(Tuple.Create(" ", 300), Tuple.Create("fa-square", 301), true)
, Tuple.Create(Tuple.Create(" ", 310), Tuple.Create("deviceStatus", 311), true)
#line 7 "..\..\Views\Device\Show.cshtml"
, Tuple.Create(Tuple.Create(" ", 279), Tuple.Create<System.Object, System.Int32>(Model.Device.StatusCode()
#line 8 "..\..\Views\Device\Show.cshtml"
, Tuple.Create(Tuple.Create(" ", 323), Tuple.Create<System.Object, System.Int32>(Model.Device.StatusCode()
#line default
#line hidden
, 280), false)
, 324), false)
);
WriteLiteral("></i>&nbsp;");
#line 7 "..\..\Views\Device\Show.cshtml"
#line 8 "..\..\Views\Device\Show.cshtml"
Write(Model.Device.Status());
@@ -90,10 +96,184 @@ WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(">\r\n $(function () {\r\n $(\'#Device_Show_Status\').appendTo" +
"(\'#layout_PageHeading\')\r\n });\r\n </script>\r\n </div>\r\n");
#line 15 "..\..\Views\Device\Show.cshtml"
#line default
#line hidden
#line 15 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowFlagAssignments))
{
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" id=\"Device_Show_Flags\"");
WriteLiteral(">\r\n");
#line 18 "..\..\Views\Device\Show.cshtml"
#line default
#line hidden
#line 18 "..\..\Views\Device\Show.cshtml"
foreach (var flag in Model.Device.DeviceFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, DeviceFlagService.GetDeviceFlag(f.DeviceFlagId))))
{
#line default
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 907), Tuple.Create("\"", 983)
, Tuple.Create(Tuple.Create("", 915), Tuple.Create("flag", 915), true)
, Tuple.Create(Tuple.Create(" ", 919), Tuple.Create("fa", 920), true)
, Tuple.Create(Tuple.Create(" ", 922), Tuple.Create("fa-", 923), true)
#line 20 "..\..\Views\Device\Show.cshtml"
, Tuple.Create(Tuple.Create("", 926), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
#line default
#line hidden
, 926), false)
, Tuple.Create(Tuple.Create(" ", 944), Tuple.Create("fa-fw", 945), true)
, Tuple.Create(Tuple.Create(" ", 950), Tuple.Create("fa-lg", 951), true)
, Tuple.Create(Tuple.Create(" ", 956), Tuple.Create("d-", 957), true)
#line 20 "..\..\Views\Device\Show.cshtml"
, Tuple.Create(Tuple.Create("", 959), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
#line default
#line hidden
, 959), false)
);
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"details\"");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"name\"");
WriteLiteral(">");
#line 22 "..\..\Views\Device\Show.cshtml"
Write(flag.Item2.Name);
#line default
#line hidden
WriteLiteral("</span>");
#line 22 "..\..\Views\Device\Show.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"comments\"");
WriteLiteral(">");
#line 23 "..\..\Views\Device\Show.cshtml"
Write(flag.Item1.Comments.ToHtmlComment());
#line default
#line hidden
WriteLiteral("</span>");
#line 23 "..\..\Views\Device\Show.cshtml"
}
#line default
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"added\"");
WriteLiteral(">");
#line 23 "..\..\Views\Device\Show.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
#line default
#line hidden
WriteLiteral("</span>\r\n </span>\r\n </i>\r\n");
#line 26 "..\..\Views\Device\Show.cshtml"
}
#line default
#line hidden
WriteLiteral(" </div>\r\n");
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@">
$(function () {
$('#Device_Show_Flags')
.appendTo('#layout_PageHeading')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: ""right top"",
at: ""right bottom"",
collision: ""flipfit flip""
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
");
#line 59 "..\..\Views\Device\Show.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 14 "..\..\Views\Device\Show.cshtml"
#line 60 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model));
@@ -134,13 +314,13 @@ WriteLiteral(" id=\"DeviceDetailTabItems\"");
WriteLiteral("></ul>\r\n");
#line 50 "..\..\Views\Device\Show.cshtml"
#line 96 "..\..\Views\Device\Show.cshtml"
#line default
#line hidden
#line 50 "..\..\Views\Device\Show.cshtml"
#line 96 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowJobs))
{
@@ -148,14 +328,14 @@ WriteLiteral("></ul>\r\n");
#line default
#line hidden
#line 52 "..\..\Views\Device\Show.cshtml"
#line 98 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model));
#line default
#line hidden
#line 52 "..\..\Views\Device\Show.cshtml"
#line 98 "..\..\Views\Device\Show.cshtml"
}
@@ -165,7 +345,7 @@ WriteLiteral("></ul>\r\n");
WriteLiteral(" ");
#line 54 "..\..\Views\Device\Show.cshtml"
#line 100 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowDetails))
{
@@ -173,14 +353,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 56 "..\..\Views\Device\Show.cshtml"
#line 102 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model));
#line default
#line hidden
#line 56 "..\..\Views\Device\Show.cshtml"
#line 102 "..\..\Views\Device\Show.cshtml"
}
@@ -190,7 +370,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 58 "..\..\Views\Device\Show.cshtml"
#line 104 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAssignmentHistory))
{
@@ -198,14 +378,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 60 "..\..\Views\Device\Show.cshtml"
#line 106 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model));
#line default
#line hidden
#line 60 "..\..\Views\Device\Show.cshtml"
#line 106 "..\..\Views\Device\Show.cshtml"
}
@@ -215,7 +395,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 62 "..\..\Views\Device\Show.cshtml"
#line 108 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAttachments))
{
@@ -223,14 +403,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 64 "..\..\Views\Device\Show.cshtml"
#line 110 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model));
#line default
#line hidden
#line 64 "..\..\Views\Device\Show.cshtml"
#line 110 "..\..\Views\Device\Show.cshtml"
}
@@ -240,7 +420,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 66 "..\..\Views\Device\Show.cshtml"
#line 112 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowFlagAssignments))
{
@@ -248,14 +428,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 68 "..\..\Views\Device\Show.cshtml"
#line 114 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Flags, Model));
#line default
#line hidden
#line 68 "..\..\Views\Device\Show.cshtml"
#line 114 "..\..\Views\Device\Show.cshtml"
}
@@ -265,7 +445,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 70 "..\..\Views\Device\Show.cshtml"
#line 116 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowCertificates))
{
@@ -273,14 +453,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 72 "..\..\Views\Device\Show.cshtml"
#line 118 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model));
#line default
#line hidden
#line 72 "..\..\Views\Device\Show.cshtml"
#line 118 "..\..\Views\Device\Show.cshtml"
}
Disco.Web/Views/Device/_DeviceTable.cshtml
+78 -20
View File
@@ -1,4 +1,5 @@
@model IEnumerable<Disco.Models.Services.Searching.DeviceSearchResultItem>
@using Disco.Services.Devices.DeviceFlags;
@{
var canShowDevices = Authorization.Has(Claims.Device.Show);
var canShowUsers = Authorization.Has(Claims.User.Show);
@@ -7,7 +8,7 @@
}
<div class="genericData deviceTable">
@if (Model != null && Model.Count() > 0)
{
{
<table class="genericData deviceTable">
<thead>
<tr>
@@ -29,15 +30,32 @@
<td>
@if (canShowDevices)
{@Html.ActionLink(item.Id, MVC.Device.Show(item.Id))}
else
{@item.Id}
else
{@item.Id}
@if (Authorization.Has(Claims.Device.ShowFlagAssignments))
{
@if (item.DeviceFlagAssignments != null && item.DeviceFlagAssignments.Count > 0)
{
<div class="flags">
@foreach (var flag in item.DeviceFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, DeviceFlagService.GetDeviceFlag(f.DeviceFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw d-@(flag.Item2.IconColour)">
<span class="details">
<span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span>
</i>
}
</div>
}
}
</td>
<td>
@item.AssetNumber
</td>
<td>
@if (item.DecommissionedDate.HasValue)
{ @CommonHelpers.FriendlyDate(item.DecommissionedDate.Value) }
{@CommonHelpers.FriendlyDate(item.DecommissionedDate.Value)}
</td>
<td>
@if (string.IsNullOrWhiteSpace(item.ComputerName))
@@ -45,7 +63,7 @@
<span class="smallMessage">Unknown</span>
}
else
{
{
@item.ComputerName
}
</td>
@@ -55,8 +73,8 @@
<span>@item.DeviceModelDescription</span>
}
else
{
<span class="smallMessage">Unknown</span>
{
<span class="smallMessage">Unknown</span>
}
</td>
<td>
@@ -68,25 +86,26 @@
<span>@item.DeviceBatchName</span>
}
else
{
<span class="smallMessage">N/A</span>
{
<span class="smallMessage">N/A</span>
}
</td>
<td>
@if (string.IsNullOrEmpty(item.AssignedUserId))
{
<span class="smallMessage">N/A</span>
<span class="smallMessage">N/A</span>
}
else
{
<span>@if (canShowUsers)
{
@Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId))
}
else
{
@item.AssignedUserDescription
}
{
<span>
@if (canShowUsers)
{
@Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId))
}
else
{
@item.AssignedUserDescription
}
</span>
}
</td>
@@ -97,9 +116,48 @@
}
</tbody>
</table>
<script type="text/javascript">
$(function () {
var userTable = $('table.deviceTable');
userTable.each(function () {
var $this = $(this);
if (!$this.data('deviceTable_Flags')) {
$this.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
collision: "flipfit flip"
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
$this.data('deviceTable_Flags', true)
}
});
});
</script>
}
else
{
{
<span class="smallMessage">No Devices Found</span>
}
</div>
Disco.Web/Views/Device/_DeviceTable.generated.cs
+338 -134
View File
@@ -30,6 +30,12 @@ namespace Disco.Web.Views.Device
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
#line 2 "..\..\Views\Device\_DeviceTable.cshtml"
using Disco.Services.Devices.DeviceFlags;
#line default
#line hidden
using Disco.Services.Web;
using Disco.Web;
using Disco.Web.Extensions;
@@ -44,7 +50,7 @@ namespace Disco.Web.Views.Device
public override void Execute()
{
#line 2 "..\..\Views\Device\_DeviceTable.cshtml"
#line 3 "..\..\Views\Device\_DeviceTable.cshtml"
var canShowDevices = Authorization.Has(Claims.Device.Show);
var canShowUsers = Authorization.Has(Claims.User.Show);
@@ -61,15 +67,15 @@ WriteLiteral(" class=\"genericData deviceTable\"");
WriteLiteral(">\r\n");
#line 9 "..\..\Views\Device\_DeviceTable.cshtml"
#line 10 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 9 "..\..\Views\Device\_DeviceTable.cshtml"
#line 10 "..\..\Views\Device\_DeviceTable.cshtml"
if (Model != null && Model.Count() > 0)
{
{
#line default
@@ -96,13 +102,13 @@ WriteLiteral(@">Decommissioned</th>
");
#line 26 "..\..\Views\Device\_DeviceTable.cshtml"
#line 27 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 26 "..\..\Views\Device\_DeviceTable.cshtml"
#line 27 "..\..\Views\Device\_DeviceTable.cshtml"
foreach (var item in Model)
{
@@ -111,56 +117,203 @@ WriteLiteral(@">Decommissioned</th>
#line hidden
WriteLiteral(" <tr");
WriteAttribute("class", Tuple.Create(" class=\"", 981), Tuple.Create("\"", 1058)
WriteAttribute("class", Tuple.Create(" class=\"", 1024), Tuple.Create("\"", 1101)
#line 28 "..\..\Views\Device\_DeviceTable.cshtml"
, Tuple.Create(Tuple.Create("", 989), Tuple.Create<System.Object, System.Int32>(item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty
#line 29 "..\..\Views\Device\_DeviceTable.cshtml"
, Tuple.Create(Tuple.Create("", 1032), Tuple.Create<System.Object, System.Int32>(item.DecommissionedDate.HasValue ? "decommissioned" : string.Empty
#line default
#line hidden
, 989), false)
, 1032), false)
);
WriteLiteral(">\r\n <td>\r\n");
#line 30 "..\..\Views\Device\_DeviceTable.cshtml"
#line 31 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 30 "..\..\Views\Device\_DeviceTable.cshtml"
#line 31 "..\..\Views\Device\_DeviceTable.cshtml"
if (canShowDevices)
{
#line default
#line hidden
#line 31 "..\..\Views\Device\_DeviceTable.cshtml"
#line 32 "..\..\Views\Device\_DeviceTable.cshtml"
Write(Html.ActionLink(item.Id, MVC.Device.Show(item.Id)));
#line default
#line hidden
#line 31 "..\..\Views\Device\_DeviceTable.cshtml"
#line 32 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
else
{
#line default
#line hidden
#line 33 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.Id);
#line 34 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.Id);
#line default
#line hidden
#line 33 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line 34 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 35 "..\..\Views\Device\_DeviceTable.cshtml"
if (Authorization.Has(Claims.Device.ShowFlagAssignments))
{
#line default
#line hidden
#line 37 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DeviceFlagAssignments != null && item.DeviceFlagAssignments.Count > 0)
{
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" class=\"flags\"");
WriteLiteral(">\r\n");
#line 40 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 40 "..\..\Views\Device\_DeviceTable.cshtml"
foreach (var flag in item.DeviceFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, DeviceFlagService.GetDeviceFlag(f.DeviceFlagId))))
{
#line default
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 1953), Tuple.Create("\"", 2023)
, Tuple.Create(Tuple.Create("", 1961), Tuple.Create("flag", 1961), true)
, Tuple.Create(Tuple.Create(" ", 1965), Tuple.Create("fa", 1966), true)
, Tuple.Create(Tuple.Create(" ", 1968), Tuple.Create("fa-", 1969), true)
#line 42 "..\..\Views\Device\_DeviceTable.cshtml"
, Tuple.Create(Tuple.Create("", 1972), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
#line default
#line hidden
, 1972), false)
, Tuple.Create(Tuple.Create(" ", 1990), Tuple.Create("fa-fw", 1991), true)
, Tuple.Create(Tuple.Create(" ", 1996), Tuple.Create("d-", 1997), true)
#line 42 "..\..\Views\Device\_DeviceTable.cshtml"
, Tuple.Create(Tuple.Create("", 1999), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
#line default
#line hidden
, 1999), false)
);
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"details\"");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"name\"");
WriteLiteral(">");
#line 44 "..\..\Views\Device\_DeviceTable.cshtml"
Write(flag.Item2.Name);
#line default
#line hidden
WriteLiteral("</span>");
#line 44 "..\..\Views\Device\_DeviceTable.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"comments\"");
WriteLiteral(">");
#line 45 "..\..\Views\Device\_DeviceTable.cshtml"
Write(flag.Item1.Comments.ToHtmlComment());
#line default
#line hidden
WriteLiteral("</span>");
#line 45 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"added\"");
WriteLiteral(">");
#line 45 "..\..\Views\Device\_DeviceTable.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
#line default
#line hidden
WriteLiteral("</span>\r\n </span>\r\n " +
" </i>\r\n");
#line 48 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
#line 50 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
#line 50 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
@@ -170,7 +323,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" ");
#line 36 "..\..\Views\Device\_DeviceTable.cshtml"
#line 54 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.AssetNumber);
@@ -179,28 +332,28 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n <td>\r\n");
#line 39 "..\..\Views\Device\_DeviceTable.cshtml"
#line 57 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 39 "..\..\Views\Device\_DeviceTable.cshtml"
#line 57 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DecommissionedDate.HasValue)
{
{
#line default
#line hidden
#line 40 "..\..\Views\Device\_DeviceTable.cshtml"
Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value));
#line 58 "..\..\Views\Device\_DeviceTable.cshtml"
Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value));
#line default
#line hidden
#line 40 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line 58 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
@@ -208,13 +361,13 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" </td>\r\n <td>\r\n");
#line 43 "..\..\Views\Device\_DeviceTable.cshtml"
#line 61 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 43 "..\..\Views\Device\_DeviceTable.cshtml"
#line 61 "..\..\Views\Device\_DeviceTable.cshtml"
if (string.IsNullOrWhiteSpace(item.ComputerName))
{
@@ -228,23 +381,23 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">Unknown</span>\r\n");
#line 46 "..\..\Views\Device\_DeviceTable.cshtml"
#line 64 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
{
#line default
#line hidden
#line 49 "..\..\Views\Device\_DeviceTable.cshtml"
#line 67 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.ComputerName);
#line default
#line hidden
#line 49 "..\..\Views\Device\_DeviceTable.cshtml"
#line 67 "..\..\Views\Device\_DeviceTable.cshtml"
}
@@ -254,13 +407,13 @@ WriteLiteral(">Unknown</span>\r\n");
WriteLiteral(" </td>\r\n <td>\r\n");
#line 53 "..\..\Views\Device\_DeviceTable.cshtml"
#line 71 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 53 "..\..\Views\Device\_DeviceTable.cshtml"
#line 71 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DeviceModelDescription != null)
{
@@ -270,7 +423,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" <span>");
#line 55 "..\..\Views\Device\_DeviceTable.cshtml"
#line 73 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.DeviceModelDescription);
@@ -279,10 +432,10 @@ WriteLiteral(" <span>");
WriteLiteral("</span>\r\n");
#line 56 "..\..\Views\Device\_DeviceTable.cshtml"
#line 74 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
{
#line default
@@ -291,10 +444,10 @@ WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">Unknown</span> \r\n");
WriteLiteral(">Unknown</span>\r\n");
#line 60 "..\..\Views\Device\_DeviceTable.cshtml"
#line 78 "..\..\Views\Device\_DeviceTable.cshtml"
}
@@ -305,7 +458,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" ");
#line 63 "..\..\Views\Device\_DeviceTable.cshtml"
#line 81 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.DeviceProfileName);
@@ -314,13 +467,13 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n <td>\r\n");
#line 66 "..\..\Views\Device\_DeviceTable.cshtml"
#line 84 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 66 "..\..\Views\Device\_DeviceTable.cshtml"
#line 84 "..\..\Views\Device\_DeviceTable.cshtml"
if (item.DeviceBatchName != null)
{
@@ -330,7 +483,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" <span>");
#line 68 "..\..\Views\Device\_DeviceTable.cshtml"
#line 86 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.DeviceBatchName);
@@ -339,38 +492,9 @@ WriteLiteral(" <span>");
WriteLiteral("</span>\r\n");
#line 69 "..\..\Views\Device\_DeviceTable.cshtml"
#line 87 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span> \r\n");
#line 73 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n <td>\r\n");
#line 76 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 76 "..\..\Views\Device\_DeviceTable.cshtml"
if (string.IsNullOrEmpty(item.AssignedUserId))
{
@@ -380,60 +504,7 @@ WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span> \r\n");
#line 79 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" <span>");
#line 82 "..\..\Views\Device\_DeviceTable.cshtml"
if (canShowUsers)
{
#line default
#line hidden
#line 84 "..\..\Views\Device\_DeviceTable.cshtml"
Write(Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId)));
#line default
#line hidden
#line 84 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
#line default
#line hidden
#line 88 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.AssignedUserDescription);
#line default
#line hidden
#line 88 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral(" </span>\r\n");
WriteLiteral(">N/A</span>\r\n");
#line 91 "..\..\Views\Device\_DeviceTable.cshtml"
@@ -444,10 +515,98 @@ WriteLiteral(" </span>\r\n");
#line hidden
WriteLiteral(" </td>\r\n <td>\r\n");
#line 94 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 94 "..\..\Views\Device\_DeviceTable.cshtml"
if (string.IsNullOrEmpty(item.AssignedUserId))
{
#line default
#line hidden
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span>\r\n");
#line 97 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" <span>\r\n");
#line 101 "..\..\Views\Device\_DeviceTable.cshtml"
#line default
#line hidden
#line 101 "..\..\Views\Device\_DeviceTable.cshtml"
if (canShowUsers)
{
#line default
#line hidden
#line 103 "..\..\Views\Device\_DeviceTable.cshtml"
Write(Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId)));
#line default
#line hidden
#line 103 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
#line default
#line hidden
#line 107 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.AssignedUserDescription);
#line default
#line hidden
#line 107 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral(" </span>\r\n");
#line 110 "..\..\Views\Device\_DeviceTable.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n <td>\r\n");
WriteLiteral(" ");
#line 94 "..\..\Views\Device\_DeviceTable.cshtml"
#line 113 "..\..\Views\Device\_DeviceTable.cshtml"
Write(item.JobCount);
@@ -456,7 +615,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n </tr>\r\n");
#line 97 "..\..\Views\Device\_DeviceTable.cshtml"
#line 116 "..\..\Views\Device\_DeviceTable.cshtml"
}
@@ -464,11 +623,56 @@ 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(@">
$(function () {
var userTable = $('table.deviceTable');
userTable.each(function () {
var $this = $(this);
if (!$this.data('deviceTable_Flags')) {
$this.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: ""right top"",
at: ""right bottom"",
collision: ""flipfit flip""
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
$this.data('deviceTable_Flags', true)
}
});
});
</script>
");
#line 100 "..\..\Views\Device\_DeviceTable.cshtml"
#line 158 "..\..\Views\Device\_DeviceTable.cshtml"
}
else
{
{
#line default
@@ -480,7 +684,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Devices Found</span>\r\n");
#line 104 "..\..\Views\Device\_DeviceTable.cshtml"
#line 162 "..\..\Views\Device\_DeviceTable.cshtml"
}
Disco.Web/Views/Job/JobParts/_Subject.cshtml
+110 -63
View File
@@ -1,6 +1,7 @@
@model Disco.Web.Models.Job.ShowModel
@using Disco.Models.Services.Job;
@using Disco.Services.Users.UserFlags;
@using Disco.Services.Devices.DeviceFlags;
@{
Authorization.Require(Claims.Job.Show);
}
@@ -190,69 +191,115 @@
{
<div id="Job_Show_Device_Batch" title="Batch">@Html.ActionLink(Model.Job.Device.DeviceBatch.Name, MVC.Config.DeviceBatch.Index(Model.Job.Device.DeviceBatchId))</div>
}
@if (Model.Job.Device.DeviceBatch != null)
{
if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar)
{
<div id="Job_Show_Device_Details_HWar">
<div>DEVICE WARRANTY</div>
<div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil" data-livestamp="@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToUnixEpoc()">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFullDateTime("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails))
{
<a id="Job_Show_Device_Details_HWar_Details_Button" href="#">Show Details</a>
<div id="Job_Show_Device_Details_HWar_Details_Dialog" class="dialog" title="Warranty Details for @(Model.Job.Device.DeviceBatch.Name)">
<div>@(new HtmlString(Model.Job.Device.DeviceBatch.WarrantyDetails))</div>
</div>
<script type="text/javascript">
$(function () {
var d;
$('#Job_Show_Device_Details_HWar_Details_Button').click(function () {
if (!d)
d = $('#Job_Show_Device_Details_HWar_Details_Dialog').dialog({
width: 570,
modal: true
});
else
d.dialog('open');
return false;
});
});
</script>
}
</div>
}
if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar)
{
<div id="Job_Show_Device_Details_HNWar">
<div>INSURANCE</div>
<div id="Job_Show_Device_Details_HNWar_InsuranceSupplier">@Model.Job.Device.DeviceBatch.InsuranceSupplier</div>
<div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil" data-livestamp="@Model.Job.Device.DeviceBatch.InsuredUntil.ToUnixEpoc()">@Model.Job.Device.DeviceBatch.InsuredUntil.ToFullDateTime("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails))
{
<a id="Job_Show_Device_Details_HNWar_Details_Button" href="#">Show Details</a>
<div id="Job_Show_Device_Details_HNWar_Details_Dialog" class="dialog" title="Insurance Details for @(Model.Job.Device.DeviceBatch.Name)">
<div>@(new HtmlString(Model.Job.Device.DeviceBatch.InsuranceDetails))</div>
</div>
<script type="text/javascript">
$(function () {
var d;
$('#Job_Show_Device_Details_HNWar_Details_Button').click(function () {
if (!d)
d = $('#Job_Show_Device_Details_HNWar_Details_Dialog').dialog({
width: 570,
modal: true
});
else
d.dialog('open');
return false;
});
});
</script>
}
</div>
}
}
@if (Authorization.Has(Claims.Device.ShowFlagAssignments) &&
Model.Job.Device.DeviceFlagAssignments != null &&
Model.Job.Device.DeviceFlagAssignments.Any(a => !a.RemovedDate.HasValue))
{
<div id="Job_Show_Device_Flags">
@foreach (var flag in Model.Job.Device.DeviceFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, DeviceFlagService.GetDeviceFlag(f.DeviceFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw d-@(flag.Item2.IconColour)">
<span class="details">
<span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span>
</i>
}
<script type="text/javascript">
$(function () {
$('#Job_Show_Device_Flags')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
collision: "flipfit flip"
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
</div>
}
</div>
@if (Model.Job.Device.DeviceBatch != null)
{
if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar)
{
<div id="Job_Show_Device_Details_HWar">
<div>DEVICE WARRANTY</div>
<div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil" data-livestamp="@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToUnixEpoc()">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFullDateTime("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails))
{
<a id="Job_Show_Device_Details_HWar_Details_Button" href="#">Show Details</a>
<div id="Job_Show_Device_Details_HWar_Details_Dialog" class="dialog" title="Warranty Details for @(Model.Job.Device.DeviceBatch.Name)">
<div>@(new HtmlString(Model.Job.Device.DeviceBatch.WarrantyDetails))</div>
</div>
<script type="text/javascript">
$(function () {
var d;
$('#Job_Show_Device_Details_HWar_Details_Button').click(function () {
if (!d)
d = $('#Job_Show_Device_Details_HWar_Details_Dialog').dialog({
width: 570,
modal: true
});
else
d.dialog('open');
return false;
});
});
</script>
}
</div>
}
if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar)
{
<div id="Job_Show_Device_Details_HNWar">
<div>INSURANCE</div>
<div id="Job_Show_Device_Details_HNWar_InsuranceSupplier">@Model.Job.Device.DeviceBatch.InsuranceSupplier</div>
<div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil" data-livestamp="@Model.Job.Device.DeviceBatch.InsuredUntil.ToUnixEpoc()">@Model.Job.Device.DeviceBatch.InsuredUntil.ToFullDateTime("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails))
{
<a id="Job_Show_Device_Details_HNWar_Details_Button" href="#">Show Details</a>
<div id="Job_Show_Device_Details_HNWar_Details_Dialog" class="dialog" title="Insurance Details for @(Model.Job.Device.DeviceBatch.Name)">
<div>@(new HtmlString(Model.Job.Device.DeviceBatch.InsuranceDetails))</div>
</div>
<script type="text/javascript">
$(function () {
var d;
$('#Job_Show_Device_Details_HNWar_Details_Button').click(function () {
if (!d)
d = $('#Job_Show_Device_Details_HNWar_Details_Dialog').dialog({
width: 570,
modal: true
});
else
d.dialog('open');
return false;
});
});
</script>
}
</div>
}
}
</div>
@if (Model.Job.DeviceHeld.HasValue)
{
@@ -469,7 +516,7 @@
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'User_FlagAssignment_Tooltip',
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+565 -400
View File
File diff suppressed because it is too large Load Diff
Disco.Web/Views/User/Show.cshtml
+45 -38
View File
@@ -6,44 +6,51 @@
ViewBag.Title = Html.ToBreadcrumb("Users", MVC.User.Index(), string.Format("User: {0} ({1})", Model.User.DisplayName, Model.User.FriendlyId()));
}
<div id="User_Show">
<div id="User_Show_Flags">
@foreach (var flag in Model.User.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw fa-lg d-@(flag.Item2.IconColour)"><span class="details"><span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span></span></i>
}
</div>
<script type="text/javascript">
$(function () {
$('#User_Show_Flags')
.appendTo('#layout_PageHeading')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'User_FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
collision: "flipfit flip"
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
@if (Authorization.Has(Claims.User.ShowFlagAssignments))
{
<div id="User_Show_Flags">
@foreach (var flag in Model.User.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw fa-lg d-@(flag.Item2.IconColour)">
<span class="details">
<span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span>
</span>
</i>
}
</div>
<script type="text/javascript">
$(function () {
$('#User_Show_Flags')
.appendTo('#layout_PageHeading')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
collision: "flipfit flip"
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
}
@Html.Partial(MVC.User.Views.UserParts._Subject, Model)
<script type="text/javascript">
$(function () {
Disco.Web/Views/User/Show.generated.cs
+109 -84
View File
@@ -63,64 +63,80 @@ WriteLiteral("\r\n<div");
WriteLiteral(" id=\"User_Show\"");
WriteLiteral(">\r\n <div");
WriteLiteral(">\r\n");
#line 9 "..\..\Views\User\Show.cshtml"
#line default
#line hidden
#line 9 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowFlagAssignments))
{
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" id=\"User_Show_Flags\"");
WriteLiteral(">\r\n");
#line 10 "..\..\Views\User\Show.cshtml"
#line 12 "..\..\Views\User\Show.cshtml"
#line default
#line hidden
#line 10 "..\..\Views\User\Show.cshtml"
foreach (var flag in Model.User.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
{
#line 12 "..\..\Views\User\Show.cshtml"
foreach (var flag in Model.User.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 535), Tuple.Create("\"", 611)
, Tuple.Create(Tuple.Create("", 543), Tuple.Create("flag", 543), true)
, Tuple.Create(Tuple.Create(" ", 547), Tuple.Create("fa", 548), true)
, Tuple.Create(Tuple.Create(" ", 550), Tuple.Create("fa-", 551), true)
WriteAttribute("class", Tuple.Create(" class=\"", 620), Tuple.Create("\"", 696)
, Tuple.Create(Tuple.Create("", 628), Tuple.Create("flag", 628), true)
, Tuple.Create(Tuple.Create(" ", 632), Tuple.Create("fa", 633), true)
, Tuple.Create(Tuple.Create(" ", 635), Tuple.Create("fa-", 636), true)
#line 12 "..\..\Views\User\Show.cshtml"
, Tuple.Create(Tuple.Create("", 554), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
#line 14 "..\..\Views\User\Show.cshtml"
, Tuple.Create(Tuple.Create("", 639), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
#line default
#line hidden
, 554), false)
, Tuple.Create(Tuple.Create(" ", 572), Tuple.Create("fa-fw", 573), true)
, Tuple.Create(Tuple.Create(" ", 578), Tuple.Create("fa-lg", 579), true)
, Tuple.Create(Tuple.Create(" ", 584), Tuple.Create("d-", 585), true)
, 639), false)
, Tuple.Create(Tuple.Create(" ", 657), Tuple.Create("fa-fw", 658), true)
, Tuple.Create(Tuple.Create(" ", 663), Tuple.Create("fa-lg", 664), true)
, Tuple.Create(Tuple.Create(" ", 669), Tuple.Create("d-", 670), true)
#line 12 "..\..\Views\User\Show.cshtml"
, Tuple.Create(Tuple.Create("", 587), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
#line 14 "..\..\Views\User\Show.cshtml"
, Tuple.Create(Tuple.Create("", 672), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
#line default
#line hidden
, 587), false)
, 672), false)
);
WriteLiteral("><span");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"details\"");
WriteLiteral("><span");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"name\"");
WriteLiteral(">");
#line 12 "..\..\Views\User\Show.cshtml"
Write(flag.Item2.Name);
#line 16 "..\..\Views\User\Show.cshtml"
Write(flag.Item2.Name);
#line default
@@ -128,9 +144,9 @@ WriteLiteral(">");
WriteLiteral("</span>");
#line 12 "..\..\Views\User\Show.cshtml"
if (flag.Item1.Comments != null)
{
#line 16 "..\..\Views\User\Show.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
@@ -141,8 +157,8 @@ WriteLiteral(" class=\"comments\"");
WriteLiteral(">");
#line 13 "..\..\Views\User\Show.cshtml"
Write(flag.Item1.Comments.ToHtmlComment());
#line 17 "..\..\Views\User\Show.cshtml"
Write(flag.Item1.Comments.ToHtmlComment());
#line default
@@ -150,8 +166,8 @@ WriteLiteral(">");
WriteLiteral("</span>");
#line 13 "..\..\Views\User\Show.cshtml"
}
#line 17 "..\..\Views\User\Show.cshtml"
}
#line default
#line hidden
@@ -162,62 +178,71 @@ WriteLiteral(" class=\"added\"");
WriteLiteral(">");
#line 13 "..\..\Views\User\Show.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
#line 17 "..\..\Views\User\Show.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
#line default
#line hidden
WriteLiteral("</span></span></i>\r\n");
WriteLiteral("</span>\r\n </span>\r\n </i>\r\n");
#line 14 "..\..\Views\User\Show.cshtml"
}
#line 20 "..\..\Views\User\Show.cshtml"
}
#line default
#line hidden
WriteLiteral(" </div>\r\n <script");
WriteLiteral(" </div>\r\n");
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@">
$(function () {
$('#User_Show_Flags')
.appendTo('#layout_PageHeading')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'User_FlagAssignment_Tooltip',
position: {
my: ""right top"",
at: ""right bottom"",
collision: ""flipfit flip""
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
$(function () {
$('#User_Show_Flags')
.appendTo('#layout_PageHeading')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: ""right top"",
at: ""right bottom"",
collision: ""flipfit flip""
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
");
#line 53 "..\..\Views\User\Show.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 47 "..\..\Views\User\Show.cshtml"
#line 54 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Subject, Model));
@@ -257,13 +282,13 @@ WriteLiteral(" id=\"UserDetailTabItems\"");
WriteLiteral("></ul>\r\n");
#line 83 "..\..\Views\User\Show.cshtml"
#line 90 "..\..\Views\User\Show.cshtml"
#line default
#line hidden
#line 83 "..\..\Views\User\Show.cshtml"
#line 90 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowJobs))
{
@@ -271,14 +296,14 @@ WriteLiteral("></ul>\r\n");
#line default
#line hidden
#line 85 "..\..\Views\User\Show.cshtml"
#line 92 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Jobs, Model));
#line default
#line hidden
#line 85 "..\..\Views\User\Show.cshtml"
#line 92 "..\..\Views\User\Show.cshtml"
}
@@ -288,7 +313,7 @@ WriteLiteral("></ul>\r\n");
WriteLiteral(" ");
#line 87 "..\..\Views\User\Show.cshtml"
#line 94 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowAssignmentHistory))
{
@@ -296,14 +321,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 89 "..\..\Views\User\Show.cshtml"
#line 96 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model));
#line default
#line hidden
#line 89 "..\..\Views\User\Show.cshtml"
#line 96 "..\..\Views\User\Show.cshtml"
}
@@ -313,7 +338,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 91 "..\..\Views\User\Show.cshtml"
#line 98 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowAttachments))
{
@@ -321,14 +346,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 93 "..\..\Views\User\Show.cshtml"
#line 100 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model));
#line default
#line hidden
#line 93 "..\..\Views\User\Show.cshtml"
#line 100 "..\..\Views\User\Show.cshtml"
}
@@ -338,7 +363,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 95 "..\..\Views\User\Show.cshtml"
#line 102 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowFlagAssignments))
{
@@ -346,14 +371,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 97 "..\..\Views\User\Show.cshtml"
#line 104 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Flags, Model));
#line default
#line hidden
#line 97 "..\..\Views\User\Show.cshtml"
#line 104 "..\..\Views\User\Show.cshtml"
}
@@ -363,7 +388,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 99 "..\..\Views\User\Show.cshtml"
#line 106 "..\..\Views\User\Show.cshtml"
if (Authorization.Has(Claims.User.ShowAuthorization))
{
@@ -371,14 +396,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 101 "..\..\Views\User\Show.cshtml"
#line 108 "..\..\Views\User\Show.cshtml"
Write(Html.Partial(MVC.User.Views.UserParts._Authorization, Model));
#line default
#line hidden
#line 101 "..\..\Views\User\Show.cshtml"
#line 108 "..\..\Views\User\Show.cshtml"
}
Disco.Web/Views/User/UserParts/_Subject.cshtml
+50
View File
@@ -1,4 +1,5 @@
@model Disco.Web.Models.User.ShowModel
@using Disco.Services.Devices.DeviceFlags;
@{
Authorization.Require(Claims.User.Show);
@@ -418,6 +419,55 @@
<span class="User_Show_AssignedDevices_CurrentAssignment_Assigned">@CommonHelpers.FriendlyDate(assignment.AssignedDate)</span>
</td>
</tr>
@if (Authorization.Has(Claims.Device.ShowFlagAssignments) &&
assignment.Device.DeviceFlagAssignments.Any(a => a.RemovedDate.HasValue))
{
<tr>
<td colspan="2">
<div class="User_Show_Assigned_Devices_CurrentAssignment_Flags">
@foreach (var flag in assignment.Device.DeviceFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, DeviceFlagService.GetDeviceFlag(f.DeviceFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw d-@(flag.Item2.IconColour)">
<span class="details">
<span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span>
</i>
}
<script type="text/javascript">
$(function () {
$('.User_Show_Assigned_Devices_CurrentAssignment_Flags')
.tooltip({
items: 'i.flag',
content: function () {
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
collision: "flipfit flip"
},
hade: {
effect: ''
},
close: function (e, ui) {
ui.tooltip.hover(
function () {
$(this).stop(true).fadeTo(100, 1);
},
function () {
$(this).fadeOut(100, function () { $(this).remove(); });
});
}
});
});
</script>
</div>
</td>
</tr>
}
</tbody>
</table>
</div>
Disco.Web/Views/User/UserParts/_Subject.generated.cs
+355 -161
View File
File diff suppressed because it is too large Load Diff
Disco.Web/Views/User/_UserTable.cshtml
+32 -17
View File
@@ -5,21 +5,27 @@
}
<div class="genericData userTable">
@if (Model != null && Model.Count() > 0)
{
{
<table class="genericData userTable">
<thead>
<tr>
<th>Id
<th>
Id
</th>
<th>Surname
<th>
Surname
</th>
<th>Given Name
<th>
Given Name
</th>
<th>Display Name
<th>
Display Name
</th>
<th>Assigned Devices
<th>
Assigned Devices
</th>
<th>Jobs
<th>
Jobs
</th>
</tr>
</thead>
@@ -36,14 +42,23 @@
{
@item.FriendlyId
}
@if (item.UserFlagAssignments != null && item.UserFlagAssignments.Count > 0)
{<div class="flags">
@foreach (var flag in item.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
@if (Authorization.Has(Claims.User.ShowFlagAssignments))
{
@if (item.UserFlagAssignments != null && item.UserFlagAssignments.Count > 0)
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw d-@(flag.Item2.IconColour)"><span class="details"><span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span></span></i>
<div class="flags">
@foreach (var flag in item.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId))))
{
<i class="flag fa fa-@(flag.Item2.Icon) fa-fw d-@(flag.Item2.IconColour)">
<span class="details">
<span class="name">@flag.Item2.Name</span>@if (flag.Item1.Comments != null)
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
</span>
</i>
}
</div>
}
</div>}
}
</td>
<td>
@item.Surname
@@ -59,9 +74,9 @@
</td>
<td>
@item.JobCountOpen @if (item.JobCount > item.JobCountOpen)
{
{
<span class="smallMessage">(@(item.JobCount - item.JobCountOpen) Closed)</span>
}
}
</td>
</tr>
}
@@ -81,7 +96,7 @@
var $this = $(this);
return $this.children('.details').html();
},
tooltipClass: 'User_FlagAssignment_Tooltip',
tooltipClass: 'FlagAssignment_Tooltip',
position: {
my: "right top",
at: "right bottom",
@@ -108,7 +123,7 @@
</script>
}
else
{
{
<span class="smallMessage">No Users Found</span>
}
</div>
Disco.Web/Views/User/_UserTable.generated.cs
+106 -84
View File
@@ -72,7 +72,7 @@ WriteLiteral(">\r\n");
#line 7 "..\..\Views\User\_UserTable.cshtml"
if (Model != null && Model.Count() > 0)
{
{
#line default
@@ -84,17 +84,23 @@ WriteLiteral(" class=\"genericData userTable\"");
WriteLiteral(@">
<thead>
<tr>
<th>Id
<th>
Id
</th>
<th>Surname
<th>
Surname
</th>
<th>Given Name
<th>
Given Name
</th>
<th>Display Name
<th>
Display Name
</th>
<th>Assigned Devices
<th>
Assigned Devices
</th>
<th>Jobs
<th>
Jobs
</th>
</tr>
</thead>
@@ -102,13 +108,13 @@ WriteLiteral(@">
");
#line 27 "..\..\Views\User\_UserTable.cshtml"
#line 33 "..\..\Views\User\_UserTable.cshtml"
#line default
#line hidden
#line 27 "..\..\Views\User\_UserTable.cshtml"
#line 33 "..\..\Views\User\_UserTable.cshtml"
foreach (var item in Model)
{
@@ -118,13 +124,13 @@ WriteLiteral(@">
WriteLiteral(" <tr>\r\n <td>\r\n");
#line 31 "..\..\Views\User\_UserTable.cshtml"
#line 37 "..\..\Views\User\_UserTable.cshtml"
#line default
#line hidden
#line 31 "..\..\Views\User\_UserTable.cshtml"
#line 37 "..\..\Views\User\_UserTable.cshtml"
if (Authorization.Has(Claims.User.Show))
{
@@ -132,14 +138,14 @@ WriteLiteral(" <tr>\r\n <td>\r\n");
#line default
#line hidden
#line 33 "..\..\Views\User\_UserTable.cshtml"
#line 39 "..\..\Views\User\_UserTable.cshtml"
Write(Html.ActionLink(item.FriendlyId, MVC.User.Show(item.Id)));
#line default
#line hidden
#line 33 "..\..\Views\User\_UserTable.cshtml"
#line 39 "..\..\Views\User\_UserTable.cshtml"
}
else
@@ -149,14 +155,14 @@ WriteLiteral(" <tr>\r\n <td>\r\n");
#line default
#line hidden
#line 37 "..\..\Views\User\_UserTable.cshtml"
#line 43 "..\..\Views\User\_UserTable.cshtml"
Write(item.FriendlyId);
#line default
#line hidden
#line 37 "..\..\Views\User\_UserTable.cshtml"
#line 43 "..\..\Views\User\_UserTable.cshtml"
}
@@ -166,69 +172,78 @@ WriteLiteral(" <tr>\r\n <td>\r\n");
WriteLiteral(" ");
#line 39 "..\..\Views\User\_UserTable.cshtml"
if (item.UserFlagAssignments != null && item.UserFlagAssignments.Count > 0)
#line 45 "..\..\Views\User\_UserTable.cshtml"
if (Authorization.Has(Claims.User.ShowFlagAssignments))
{
#line default
#line hidden
WriteLiteral("<div");
#line 47 "..\..\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 41 "..\..\Views\User\_UserTable.cshtml"
#line 50 "..\..\Views\User\_UserTable.cshtml"
#line default
#line hidden
#line 41 "..\..\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 50 "..\..\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");
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 1722), Tuple.Create("\"", 1792)
, Tuple.Create(Tuple.Create("", 1730), Tuple.Create("flag", 1730), true)
, Tuple.Create(Tuple.Create(" ", 1734), Tuple.Create("fa", 1735), true)
, Tuple.Create(Tuple.Create(" ", 1737), Tuple.Create("fa-", 1738), true)
WriteAttribute("class", Tuple.Create(" class=\"", 2064), Tuple.Create("\"", 2134)
, Tuple.Create(Tuple.Create("", 2072), Tuple.Create("flag", 2072), true)
, Tuple.Create(Tuple.Create(" ", 2076), Tuple.Create("fa", 2077), true)
, Tuple.Create(Tuple.Create(" ", 2079), Tuple.Create("fa-", 2080), true)
#line 43 "..\..\Views\User\_UserTable.cshtml"
, Tuple.Create(Tuple.Create("", 1741), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
#line 52 "..\..\Views\User\_UserTable.cshtml"
, Tuple.Create(Tuple.Create("", 2083), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
#line default
#line hidden
, 1741), false)
, Tuple.Create(Tuple.Create(" ", 1759), Tuple.Create("fa-fw", 1760), true)
, Tuple.Create(Tuple.Create(" ", 1765), Tuple.Create("d-", 1766), true)
, 2083), false)
, Tuple.Create(Tuple.Create(" ", 2101), Tuple.Create("fa-fw", 2102), true)
, Tuple.Create(Tuple.Create(" ", 2107), Tuple.Create("d-", 2108), true)
#line 43 "..\..\Views\User\_UserTable.cshtml"
, Tuple.Create(Tuple.Create("", 1768), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
#line 52 "..\..\Views\User\_UserTable.cshtml"
, Tuple.Create(Tuple.Create("", 2110), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
#line default
#line hidden
, 1768), false)
, 2110), false)
);
WriteLiteral("><span");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"details\"");
WriteLiteral("><span");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"name\"");
WriteLiteral(">");
#line 43 "..\..\Views\User\_UserTable.cshtml"
Write(flag.Item2.Name);
#line 54 "..\..\Views\User\_UserTable.cshtml"
Write(flag.Item2.Name);
#line default
@@ -236,9 +251,9 @@ WriteLiteral(">");
WriteLiteral("</span>");
#line 43 "..\..\Views\User\_UserTable.cshtml"
if (flag.Item1.Comments != null)
{
#line 54 "..\..\Views\User\_UserTable.cshtml"
if (flag.Item1.Comments != null)
{
#line default
#line hidden
@@ -249,8 +264,8 @@ WriteLiteral(" class=\"comments\"");
WriteLiteral(">");
#line 44 "..\..\Views\User\_UserTable.cshtml"
Write(flag.Item1.Comments.ToHtmlComment());
#line 55 "..\..\Views\User\_UserTable.cshtml"
Write(flag.Item1.Comments.ToHtmlComment());
#line default
@@ -258,8 +273,8 @@ WriteLiteral(">");
WriteLiteral("</span>");
#line 44 "..\..\Views\User\_UserTable.cshtml"
}
#line 55 "..\..\Views\User\_UserTable.cshtml"
}
#line default
#line hidden
@@ -270,26 +285,33 @@ WriteLiteral(" class=\"added\"");
WriteLiteral(">");
#line 44 "..\..\Views\User\_UserTable.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
#line 55 "..\..\Views\User\_UserTable.cshtml"
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
#line default
#line hidden
WriteLiteral("</span></span></i>\r\n");
WriteLiteral("</span>\r\n </span>\r\n " +
" </i>\r\n");
#line 45 "..\..\Views\User\_UserTable.cshtml"
#line 58 "..\..\Views\User\_UserTable.cshtml"
}
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
#line 60 "..\..\Views\User\_UserTable.cshtml"
}
#line default
#line hidden
WriteLiteral(" </div>");
#line 46 "..\..\Views\User\_UserTable.cshtml"
}
#line 60 "..\..\Views\User\_UserTable.cshtml"
}
#line default
@@ -299,7 +321,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
WriteLiteral(" ");
#line 49 "..\..\Views\User\_UserTable.cshtml"
#line 64 "..\..\Views\User\_UserTable.cshtml"
Write(item.Surname);
@@ -310,7 +332,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" ");
#line 52 "..\..\Views\User\_UserTable.cshtml"
#line 67 "..\..\Views\User\_UserTable.cshtml"
Write(item.GivenName);
@@ -321,7 +343,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" ");
#line 55 "..\..\Views\User\_UserTable.cshtml"
#line 70 "..\..\Views\User\_UserTable.cshtml"
Write(item.DisplayName);
@@ -332,7 +354,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" ");
#line 58 "..\..\Views\User\_UserTable.cshtml"
#line 73 "..\..\Views\User\_UserTable.cshtml"
Write(item.AssignedDevicesCount);
@@ -343,7 +365,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
WriteLiteral(" ");
#line 61 "..\..\Views\User\_UserTable.cshtml"
#line 76 "..\..\Views\User\_UserTable.cshtml"
Write(item.JobCountOpen);
@@ -352,9 +374,9 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 61 "..\..\Views\User\_UserTable.cshtml"
#line 76 "..\..\Views\User\_UserTable.cshtml"
if (item.JobCount > item.JobCountOpen)
{
{
#line default
@@ -366,7 +388,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">(");
#line 63 "..\..\Views\User\_UserTable.cshtml"
#line 78 "..\..\Views\User\_UserTable.cshtml"
Write(item.JobCount - item.JobCountOpen);
@@ -375,8 +397,8 @@ WriteLiteral(">(");
WriteLiteral(" Closed)</span>\r\n");
#line 64 "..\..\Views\User\_UserTable.cshtml"
}
#line 79 "..\..\Views\User\_UserTable.cshtml"
}
#line default
@@ -384,7 +406,7 @@ WriteLiteral(" Closed)</span>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n");
#line 67 "..\..\Views\User\_UserTable.cshtml"
#line 82 "..\..\Views\User\_UserTable.cshtml"
}
@@ -403,26 +425,26 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable
"\',\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");
" tooltipClass: \'FlagAssignment_Tooltip\',\r\n positi" +
"on: {\r\n my: \"right top\",\r\n " +
" at: \"right bottom\",\r\n collision: \"flipfi" +
"t 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(\'userT" +
"able_Flags\', true)\r\n }\r\n });\r\n });\r" +
"\n </script>\r\n");
#line 109 "..\..\Views\User\_UserTable.cshtml"
#line 124 "..\..\Views\User\_UserTable.cshtml"
}
else
{
{
#line default
@@ -434,7 +456,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Users Found</span>\r\n");
#line 113 "..\..\Views\User\_UserTable.cshtml"
#line 128 "..\..\Views\User\_UserTable.cshtml"
}