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

Feature: Job Queues

Browse Source 
Also UI style, theme and element changes
This commit is contained in:
Gary Sharp
2014-02-03 14:50:08 +11:00
parent bdb3e1e6b4
commit 3f63281dc4
212 changed files with 17334 additions and 5441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Shared/_JobTable.cshtml
+3 -3
View File
@@ -1,13 +1,13 @@
@model Disco.Models.BI.Job.JobTableModel
@model Disco.Models.Services.Jobs.JobLists.JobTableModel
@if (DiscoApplication.MultiSiteMode)
{
if (Model == null || Model.Items == null || Model.Items.Count == 0)
if (Model == null || Model.Items == null || Model.Items.Count() == 0)
{
<span class="smallMessage">No Jobs Found</span>
}
else
{
var multiSiteModels = Model.MultiCampusModels;
var multiSiteModels = Model.MultiCampusModels();
foreach (var multiSiteModel in multiSiteModels)
{
Disco.Web/Views/Shared/_JobTable.generated.cs
+4 -3
View File
@@ -29,6 +29,7 @@ namespace Disco.Web.Views.Shared
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Web;
using Disco.Web;
@@ -36,7 +37,7 @@ namespace Disco.Web.Views.Shared
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_JobTable.cshtml")]
public partial class JobTable : Disco.Services.Web.WebViewPage<Disco.Models.BI.Job.JobTableModel>
public partial class JobTable : Disco.Services.Web.WebViewPage<Disco.Models.Services.Jobs.JobLists.JobTableModel>
{
public JobTable()
{
@@ -47,7 +48,7 @@ namespace Disco.Web.Views.Shared
#line 2 "..\..\Views\Shared\_JobTable.cshtml"
if (DiscoApplication.MultiSiteMode)
{
if (Model == null || Model.Items == null || Model.Items.Count == 0)
if (Model == null || Model.Items == null || Model.Items.Count() == 0)
{
@@ -64,7 +65,7 @@ WriteLiteral(">No Jobs Found</span>\r\n");
}
else
{
var multiSiteModels = Model.MultiCampusModels;
var multiSiteModels = Model.MultiCampusModels();
foreach (var multiSiteModel in multiSiteModels)
{
Disco.Web/Views/Shared/_JobTableRender.cshtml
+34 -5
View File
@@ -1,4 +1,5 @@
@model Disco.Models.BI.Job.JobTableModel
@model Disco.Models.Services.Jobs.JobLists.JobTableModel
@using Disco.Models.Services.Jobs.JobLists;
@{
Html.BundleDeferred("~/ClientScripts/Modules/Disco-DataTableHelpers");
}
@@ -36,7 +37,25 @@
</thead>
<tbody>
@foreach (var item in Model.Items)
{<tr data-id="@(item.Id)" data-status="@(Model.ShowStatus ? item.StatusId : null)">
{
string statusSlaClass = null;
if (Model.ShowStatus)
{
var statusItem = (JobTableStatusItemModel)item;
if (statusItem.ActiveJobQueues != null)
{
var slaRemaining = statusItem.ActiveJobQueues.UsersQueueItems(Authorization).SlaPrecentageRemaining();
if (slaRemaining.HasValue && (slaRemaining <= 0))
{
statusSlaClass = "statusSlaExpired";
}
else if (slaRemaining.HasValue && (slaRemaining < .3))
{
statusSlaClass = "statusSlaWarning";
}
}
}
<tr data-id="@(item.Id)" data-status="@(Model.ShowStatus ? item.StatusId : null)" class="@(statusSlaClass)">
@if (Model.ShowId)
{<td class="id">
@if (Authorization.Has(Claims.Job.Show))
@@ -44,11 +63,21 @@
else
{@item.Id.ToString()}</td>}
@if (Model.ShowStatus)
{<td class="status"><i class="fa fa-square jobStatus @(item.StatusId)"></i>&nbsp;@item.StatusDescription</td>}
{
var statusItem = (JobTableStatusItemModel)item;
<td class="status"><i class="fa fa-square jobStatus @(item.StatusId)"></i>&nbsp;@item.StatusDescription
@if (statusItem.ActiveJobQueues != null)
{<div class="queues">
@foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => new Tuple<JobTableStatusQueueItemModel, Disco.Services.Jobs.JobQueues.JobQueueToken>(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId))))
{
<i class="fa fa-@(jqToken.Item2.JobQueue.Icon) fa-fw d-@(jqToken.Item2.JobQueue.IconColour)" title="@(jqToken.Item2.JobQueue.Name) [@(jqToken.Item1.Priority)]"></i>
}
</div>}
</td>}
@if (Model.ShowDates)
{<td class="dates">@if (item.ClosedDate.HasValue) {@CommonHelpers.FriendlyDate(item.ClosedDate.Value)}else{@CommonHelpers.FriendlyDate(item.OpenedDate)}</td>}
@if (Model.ShowType)
{<td class="type"><span title="@item.TypeDescription">@item.TypeId</span></td>}
{<td class="type"><span title="@item.JobTypeDescription">@item.JobTypeId</span></td>}
@if (Model.ShowDevice)
{<td class="device">
@if (item.DeviceSerialNumber != null)
@@ -74,7 +103,7 @@
@if (Model.ShowTechnician)
{<td class="technician"><span title="@item.OpenedTechUserDisplayName">@item.OpenedTechUserId</span></td>}
@if (Model.ShowLocation)
{<td class="technician"><span>@(item.Location ?? "Unknown")</span></td>}
{<td class="technician"><span>@(item.DeviceHeldLocation ?? "Unknown")</span></td>}
</tr>}
</tbody>
</table>
Disco.Web/Views/Shared/_JobTableRender.generated.cs
+250 -118
View File
@@ -29,6 +29,13 @@ namespace Disco.Web.Views.Shared
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
#line 2 "..\..\Views\Shared\_JobTableRender.cshtml"
using Disco.Models.Services.Jobs.JobLists;
#line default
#line hidden
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Web;
using Disco.Web;
@@ -36,7 +43,7 @@ namespace Disco.Web.Views.Shared
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Views/Shared/_JobTableRender.cshtml")]
public partial class JobTableRender : Disco.Services.Web.WebViewPage<Disco.Models.BI.Job.JobTableModel>
public partial class JobTableRender : Disco.Services.Web.WebViewPage<Disco.Models.Services.Jobs.JobLists.JobTableModel>
{
public JobTableRender()
{
@@ -44,7 +51,7 @@ namespace Disco.Web.Views.Shared
public override void Execute()
{
#line 2 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 3 "..\..\Views\Shared\_JobTableRender.cshtml"
Html.BundleDeferred("~/ClientScripts/Modules/Disco-DataTableHelpers");
@@ -58,13 +65,13 @@ WriteLiteral(" class=\"jobTable\"");
WriteLiteral(">\r\n");
#line 6 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 7 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 6 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 7 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model != null && Model.Items.Count() > 0)
{
@@ -73,48 +80,48 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <table");
WriteAttribute("class", Tuple.Create(" class=\"", 223), Tuple.Create("\"", 459)
, Tuple.Create(Tuple.Create("", 231), Tuple.Create("jobTable", 231), true)
WriteAttribute("class", Tuple.Create(" class=\"", 284), Tuple.Create("\"", 520)
, Tuple.Create(Tuple.Create("", 292), Tuple.Create("jobTable", 292), true)
#line 8 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 239), Tuple.Create<System.Object, System.Int32>(Model.IsSmallTable ? " smallTable" : string.Empty
#line 9 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 300), Tuple.Create<System.Object, System.Int32>(Model.IsSmallTable ? " smallTable" : string.Empty
#line default
#line hidden
, 239), false)
, 300), false)
#line 8 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 291), Tuple.Create<System.Object, System.Int32>(Model.HideClosedJobs ? " hideStatusClosed" : string.Empty
#line 9 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 352), Tuple.Create<System.Object, System.Int32>(Model.HideClosedJobs ? " hideStatusClosed" : string.Empty
#line default
#line hidden
, 291), false)
, 352), false)
#line 8 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 351), Tuple.Create<System.Object, System.Int32>(Model.EnablePaging ? " enablePaging" : string.Empty
#line 9 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 412), Tuple.Create<System.Object, System.Int32>(Model.EnablePaging ? " enablePaging" : string.Empty
#line default
#line hidden
, 351), false)
, 412), false)
#line 8 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 405), Tuple.Create<System.Object, System.Int32>(Model.EnableFilter ? " enableFilter" : string.Empty
#line 9 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 466), Tuple.Create<System.Object, System.Int32>(Model.EnableFilter ? " enableFilter" : string.Empty
#line default
#line hidden
, 405), false)
, 466), false)
);
WriteLiteral(">\r\n <thead>\r\n <tr>\r\n");
#line 11 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 12 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 11 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 12 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowId)
{
@@ -127,7 +134,7 @@ WriteLiteral(" class=\"id\"");
WriteLiteral(">Ref\r\n </th> ");
#line 13 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 14 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -136,7 +143,7 @@ WriteLiteral(">Ref\r\n </th> ");
WriteLiteral(" ");
#line 14 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 15 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowStatus)
{
@@ -149,7 +156,7 @@ WriteLiteral(" class=\"status\"");
WriteLiteral(">Status\r\n </th> ");
#line 16 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 17 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -158,7 +165,7 @@ WriteLiteral(">Status\r\n </th> ");
WriteLiteral(" ");
#line 17 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 18 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowDates)
{
@@ -171,7 +178,7 @@ WriteLiteral(" class=\"dates\"");
WriteLiteral(">When\r\n </th> ");
#line 19 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 20 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -180,7 +187,7 @@ WriteLiteral(">When\r\n </th> ");
WriteLiteral(" ");
#line 20 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 21 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowType)
{
@@ -193,7 +200,7 @@ WriteLiteral(" class=\"type\"");
WriteLiteral(">Type\r\n </th> ");
#line 22 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 23 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -202,7 +209,7 @@ WriteLiteral(">Type\r\n </th> ");
WriteLiteral(" ");
#line 23 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 24 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowDevice)
{
@@ -215,7 +222,7 @@ WriteLiteral(" class=\"device\"");
WriteLiteral(">Device\r\n </th> ");
#line 25 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 26 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -224,7 +231,7 @@ WriteLiteral(">Device\r\n </th> ");
WriteLiteral(" ");
#line 26 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 27 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowUser)
{
@@ -237,7 +244,7 @@ WriteLiteral(" class=\"user\"");
WriteLiteral(">User\r\n </th> ");
#line 28 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 29 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -246,7 +253,7 @@ WriteLiteral(">User\r\n </th> ");
WriteLiteral(" ");
#line 29 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 30 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowTechnician)
{
@@ -259,7 +266,7 @@ WriteLiteral(" class=\"technician\"");
WriteLiteral(">Technician\r\n </th> ");
#line 31 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 32 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -268,7 +275,7 @@ WriteLiteral(">Technician\r\n </th> ");
WriteLiteral(" ");
#line 32 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 33 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowLocation)
{
@@ -281,7 +288,7 @@ WriteLiteral(" class=\"location\"");
WriteLiteral(">Location\r\n </th> ");
#line 34 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 35 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -290,25 +297,43 @@ WriteLiteral(">Location\r\n </th> ");
WriteLiteral(" </tr>\r\n </thead>\r\n <tbody>\r\n");
#line 38 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 38 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
foreach (var item in Model.Items)
{
string statusSlaClass = null;
if (Model.ShowStatus)
{
var statusItem = (JobTableStatusItemModel)item;
if (statusItem.ActiveJobQueues != null)
{
var slaRemaining = statusItem.ActiveJobQueues.UsersQueueItems(Authorization).SlaPrecentageRemaining();
if (slaRemaining.HasValue && (slaRemaining <= 0))
{
statusSlaClass = "statusSlaExpired";
}
else if (slaRemaining.HasValue && (slaRemaining < .3))
{
statusSlaClass = "statusSlaWarning";
}
}
}
#line default
#line hidden
WriteLiteral("<tr");
WriteLiteral(" <tr");
WriteLiteral(" data-id=\"");
#line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.Id);
#line 58 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.Id);
#line default
@@ -318,24 +343,34 @@ WriteLiteral("\"");
WriteLiteral(" data-status=\"");
#line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(Model.ShowStatus ? item.StatusId : null);
#line 58 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(Model.ShowStatus ? item.StatusId : null);
#line default
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 2662), Tuple.Create("\"", 2687)
#line 58 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 2670), Tuple.Create<System.Object, System.Int32>(statusSlaClass
#line default
#line hidden
, 2670), false)
);
WriteLiteral(">\r\n");
#line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowId)
{
@@ -348,27 +383,27 @@ WriteLiteral(" class=\"id\"");
WriteLiteral(">\r\n");
#line 42 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 61 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 42 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 61 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Authorization.Has(Claims.Job.Show))
{
#line default
#line hidden
#line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id)));
#line default
#line hidden
#line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
}
else
{
@@ -376,14 +411,14 @@ WriteLiteral(">\r\n");
#line default
#line hidden
#line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.Id.ToString());
#line default
#line hidden
#line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -391,7 +426,7 @@ WriteLiteral(">\r\n");
WriteLiteral("</td>");
#line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -400,45 +435,142 @@ WriteLiteral("</td>");
WriteLiteral(" ");
#line 46 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowStatus)
{
var statusItem = (JobTableStatusItemModel)item;
#line default
#line hidden
WriteLiteral("<td");
WriteLiteral(" <td");
WriteLiteral(" class=\"status\"");
WriteLiteral("><i");
WriteAttribute("class", Tuple.Create(" class=\"", 2091), Tuple.Create("\"", 2138)
, Tuple.Create(Tuple.Create("", 2099), Tuple.Create("fa", 2099), true)
, Tuple.Create(Tuple.Create(" ", 2101), Tuple.Create("fa-square", 2102), true)
, Tuple.Create(Tuple.Create(" ", 2111), Tuple.Create("jobStatus", 2112), true)
WriteAttribute("class", Tuple.Create(" class=\"", 3190), Tuple.Create("\"", 3237)
, Tuple.Create(Tuple.Create("", 3198), Tuple.Create("fa", 3198), true)
, Tuple.Create(Tuple.Create(" ", 3200), Tuple.Create("fa-square", 3201), true)
, Tuple.Create(Tuple.Create(" ", 3210), Tuple.Create("jobStatus", 3211), true)
#line 47 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create(" ", 2121), Tuple.Create<System.Object, System.Int32>(item.StatusId
#line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create(" ", 3220), Tuple.Create<System.Object, System.Int32>(item.StatusId
#line default
#line hidden
, 2122), false)
, 3221), false)
);
WriteLiteral("></i>&nbsp;");
#line 47 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.StatusDescription);
#line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.StatusDescription);
#line default
#line hidden
WriteLiteral("</td>");
WriteLiteral("\r\n");
#line 47 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line 69 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 69 "..\..\Views\Shared\_JobTableRender.cshtml"
if (statusItem.ActiveJobQueues != null)
{
#line default
#line hidden
WriteLiteral("<div");
WriteLiteral(" class=\"queues\"");
WriteLiteral(">\r\n");
#line 71 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 71 "..\..\Views\Shared\_JobTableRender.cshtml"
foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => new Tuple<JobTableStatusQueueItemModel, Disco.Services.Jobs.JobQueues.JobQueueToken>(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId))))
{
#line default
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 3729), Tuple.Create("\"", 3818)
, Tuple.Create(Tuple.Create("", 3737), Tuple.Create("fa", 3737), true)
, Tuple.Create(Tuple.Create(" ", 3739), Tuple.Create("fa-", 3740), true)
#line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3743), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.Icon
#line default
#line hidden
, 3743), false)
, Tuple.Create(Tuple.Create(" ", 3773), Tuple.Create("fa-fw", 3774), true)
, Tuple.Create(Tuple.Create(" ", 3779), Tuple.Create("d-", 3780), true)
#line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3782), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.IconColour
#line default
#line hidden
, 3782), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 3819), Tuple.Create("\"", 3885)
#line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3827), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.Name
#line default
#line hidden
, 3827), false)
, Tuple.Create(Tuple.Create(" ", 3857), Tuple.Create("[", 3858), true)
#line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3859), Tuple.Create<System.Object, System.Int32>(jqToken.Item1.Priority
#line default
#line hidden
, 3859), false)
, Tuple.Create(Tuple.Create("", 3884), Tuple.Create("]", 3884), true)
);
WriteLiteral("></i>\r\n");
#line 74 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
#line hidden
WriteLiteral(" </div>");
#line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>");
#line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -446,7 +578,7 @@ WriteLiteral("</td>");
WriteLiteral(" ");
#line 48 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowDates)
{
@@ -459,33 +591,33 @@ WriteLiteral(" class=\"dates\"");
WriteLiteral(">");
#line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
if (item.ClosedDate.HasValue) {
#line default
#line hidden
#line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(CommonHelpers.FriendlyDate(item.ClosedDate.Value));
#line default
#line hidden
#line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
}else{
#line default
#line hidden
#line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(CommonHelpers.FriendlyDate(item.OpenedDate));
#line default
#line hidden
#line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -493,7 +625,7 @@ WriteLiteral(">");
WriteLiteral("</td>");
#line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -502,7 +634,7 @@ WriteLiteral("</td>");
WriteLiteral(" ");
#line 50 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 79 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowType)
{
@@ -514,21 +646,21 @@ WriteLiteral(" class=\"type\"");
WriteLiteral("><span");
WriteAttribute("title", Tuple.Create(" title=\"", 2489), Tuple.Create("\"", 2518)
WriteAttribute("title", Tuple.Create(" title=\"", 4294), Tuple.Create("\"", 4326)
#line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 2497), Tuple.Create<System.Object, System.Int32>(item.TypeDescription
#line 80 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 4302), Tuple.Create<System.Object, System.Int32>(item.JobTypeDescription
#line default
#line hidden
, 2497), false)
, 4302), false)
);
WriteLiteral(">");
#line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.TypeId);
#line 80 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.JobTypeId);
#line default
@@ -536,8 +668,8 @@ WriteLiteral(">");
WriteLiteral("</span></td>");
#line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line 80 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -545,7 +677,7 @@ WriteLiteral("</span></td>");
WriteLiteral(" ");
#line 52 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 81 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowDevice)
{
@@ -558,13 +690,13 @@ WriteLiteral(" class=\"device\"");
WriteLiteral(">\r\n");
#line 54 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 83 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 54 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 83 "..\..\Views\Shared\_JobTableRender.cshtml"
if (item.DeviceSerialNumber != null)
{
if (Authorization.Has(Claims.Device.Show))
@@ -573,14 +705,14 @@ WriteLiteral(">\r\n");
#line default
#line hidden
#line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 86 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription }));
#line default
#line hidden
#line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 86 "..\..\Views\Shared\_JobTableRender.cshtml"
}
else
{
@@ -589,20 +721,20 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral("<span");
WriteAttribute("title", Tuple.Create(" title=\"", 3023), Tuple.Create("\"", 3059)
WriteAttribute("title", Tuple.Create(" title=\"", 4834), Tuple.Create("\"", 4870)
#line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3031), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
#line 88 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 4842), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
#line default
#line hidden
, 3031), false)
, 4842), false)
);
WriteLiteral(">");
#line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 88 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.DeviceSerialNumber);
@@ -611,7 +743,7 @@ WriteLiteral(">");
WriteLiteral("</span>");
#line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 88 "..\..\Views\Shared\_JobTableRender.cshtml"
}
}
else
@@ -626,7 +758,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span>");
#line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 91 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -634,7 +766,7 @@ WriteLiteral(">N/A</span>");
WriteLiteral("</td>");
#line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 91 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -643,7 +775,7 @@ WriteLiteral("</td>");
WriteLiteral(" ");
#line 63 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 92 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowUser)
{
@@ -656,13 +788,13 @@ WriteLiteral(" class=\"user\"");
WriteLiteral(">\r\n");
#line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
#line default
#line hidden
#line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
if (item.UserId != null)
{
if (Authorization.Has(Claims.User.Show))
@@ -671,14 +803,14 @@ WriteLiteral(">\r\n");
#line default
#line hidden
#line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 97 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId)));
#line default
#line hidden
#line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 97 "..\..\Views\Shared\_JobTableRender.cshtml"
}
else
{
@@ -686,14 +818,14 @@ WriteLiteral(">\r\n");
#line default
#line hidden
#line 70 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 99 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(string.Format("{0} ({1})", item.UserDisplayName, item.UserId));
#line default
#line hidden
#line 70 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 99 "..\..\Views\Shared\_JobTableRender.cshtml"
}
}
else
@@ -708,7 +840,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">N/A</span>");
#line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 102 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -716,7 +848,7 @@ WriteLiteral(">N/A</span>");
WriteLiteral("</td>");
#line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 102 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -725,7 +857,7 @@ WriteLiteral("</td>");
WriteLiteral(" ");
#line 74 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 103 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowTechnician)
{
@@ -737,20 +869,20 @@ WriteLiteral(" class=\"technician\"");
WriteLiteral("><span");
WriteAttribute("title", Tuple.Create(" title=\"", 3947), Tuple.Create("\"", 3986)
WriteAttribute("title", Tuple.Create(" title=\"", 5758), Tuple.Create("\"", 5797)
#line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3955), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
#line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 5766), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
#line default
#line hidden
, 3955), false)
, 5766), false)
);
WriteLiteral(">");
#line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.OpenedTechUserId);
@@ -759,7 +891,7 @@ WriteLiteral(">");
WriteLiteral("</span></td>");
#line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -768,7 +900,7 @@ WriteLiteral("</span></td>");
WriteLiteral(" ");
#line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 105 "..\..\Views\Shared\_JobTableRender.cshtml"
if (Model.ShowLocation)
{
@@ -781,8 +913,8 @@ WriteLiteral(" class=\"technician\"");
WriteLiteral("><span>");
#line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.Location ?? "Unknown");
#line 106 "..\..\Views\Shared\_JobTableRender.cshtml"
Write(item.DeviceHeldLocation ?? "Unknown");
#line default
@@ -790,8 +922,8 @@ WriteLiteral("><span>");
WriteLiteral("</span></td>");
#line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line 106 "..\..\Views\Shared\_JobTableRender.cshtml"
}
#line default
@@ -799,7 +931,7 @@ WriteLiteral("</span></td>");
WriteLiteral(" </tr>");
#line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 107 "..\..\Views\Shared\_JobTableRender.cshtml"
}
@@ -808,7 +940,7 @@ WriteLiteral(" </tr>");
WriteLiteral(" </tbody>\r\n </table>\r\n");
#line 81 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 110 "..\..\Views\Shared\_JobTableRender.cshtml"
}
else
{
@@ -823,7 +955,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Jobs Found</span>\r\n");
#line 85 "..\..\Views\Shared\_JobTableRender.cshtml"
#line 114 "..\..\Views\Shared\_JobTableRender.cshtml"
}
Disco.Web/Views/Shared/_Layout.cshtml
+28 -9
View File
@@ -21,8 +21,27 @@
</div>
<nav>
<ul id="menu">
<li class="hasSubMenu">@Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1")
<ul class="subMenu">
<li class="d-sm@((string)ViewContext.ViewData["MenuArea"] == MVC.Job.Name ? " active" : null)">@Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1")
<ul>
@if (Authorization.Has(Claims.Job.Lists.JobQueueLists))
{
var queues = Disco.Services.Jobs.JobQueues.JobQueueService.GetQueues();
if (queues.Count > 0)
{
<li class="d-sm"><i class="fa fa-caret-right"></i><a>Queues</a>
<ul>
@foreach (var queueToken in queues)
{
<li><a href="@Url.Action(MVC.Job.Queue(queueToken.JobQueue.Id))"><i class="fa fa-@(queueToken.JobQueue.Icon) fa-fw d-@(queueToken.JobQueue.IconColour)"></i> @(queueToken.JobQueue.Name)</a></li>
}
</ul>
</li>
}
}
@if (Authorization.Has(Claims.Job.Lists.AwaitingTechnicianAction))
{
<li>@Html.ActionLink("Awaiting Technician Action", MVC.Job.AwaitingTechnicianAction())</li>
}
@if (Authorization.Has(Claims.Job.Lists.DevicesReadyForReturn))
{
<li>@Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn())</li>
@@ -39,8 +58,8 @@
{
if (Authorization.HasAny(Claims.Job.Lists.AwaitingFinanceCharge, Claims.Job.Lists.AwaitingFinancePayment, Claims.Job.Lists.AwaitingFinanceAgreementBreach, Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
{
<li class="hasSubMenu"><i class="fa fa-caret-right"></i>@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())
<ul class="subMenu">
<li class="d-sm"><i class="fa fa-caret-right"></i>@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())
<ul>
@if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceCharge))
{
<li>@Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge())</li>
@@ -79,12 +98,12 @@
}
</ul>
</li>
<li>@Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2")</li>
<li>@Html.ActionLink("Users", MVC.User.Index(), accesskey: "3")</li>
<li class="moveRight">@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
<li class="@((string)ViewContext.ViewData["MenuArea"] == MVC.Device.Name ? "active" : null)">@Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2")</li>
<li class="@((string)ViewContext.ViewData["MenuArea"] == MVC.User.Name ? "active" : null)">@Html.ActionLink("Users", MVC.User.Index(), accesskey: "3")</li>
<li class="moveRight@((string)ViewContext.ViewData["MenuArea"] == MVC.Public.Name ? " active" : null)">@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
@if (Authorization.Has(Claims.Config.Show))
{
<li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
<li class="@((string)ViewContext.ViewData["MenuArea"] == MVC.Config.Name ? "active" : null)">@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
}
</ul>
</nav>
@@ -94,7 +113,7 @@
else
{@CurrentUser.ToString()}</span>
@using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
{ @Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s" }) }
{ @Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s", placeholder="Search" }) }
</div>
</header>
<div id="layout_PageHeading">@CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty)</div>
Disco.Web/Views/Shared/_Layout.generated.cs
+260 -84
View File
@@ -29,6 +29,7 @@ namespace Disco.Web.Views.Shared
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Web;
using Disco.Web;
@@ -143,22 +144,27 @@ WriteLiteral(" id=\"menu\"");
WriteLiteral(">\r\n <li");
WriteLiteral(" class=\"hasSubMenu\"");
WriteAttribute("class", Tuple.Create(" class=\"", 851), Tuple.Create("\"", 941)
, Tuple.Create(Tuple.Create("", 859), Tuple.Create("d-sm", 859), true)
#line 24 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 863), Tuple.Create<System.Object, System.Int32>((string)ViewContext.ViewData["MenuArea"] == MVC.Job.Name ? " active" : null
#line default
#line hidden
, 863), false)
);
WriteLiteral(">");
#line 24 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1"));
Write(Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1"));
#line default
#line hidden
WriteLiteral("\r\n <ul");
WriteLiteral(" class=\"subMenu\"");
WriteLiteral(">\r\n");
WriteLiteral("\r\n <ul>\r\n");
#line 26 "..\..\Views\Shared\_Layout.cshtml"
@@ -168,6 +174,135 @@ WriteLiteral(">\r\n");
#line hidden
#line 26 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.JobQueueLists))
{
var queues = Disco.Services.Jobs.JobQueues.JobQueueService.GetQueues();
if (queues.Count > 0)
{
#line default
#line hidden
WriteLiteral(" <li");
WriteLiteral(" class=\"d-sm\"");
WriteLiteral("><i");
WriteLiteral(" class=\"fa fa-caret-right\"");
WriteLiteral("></i><a>Queues</a>\r\n <ul>\r\n");
#line 33 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 33 "..\..\Views\Shared\_Layout.cshtml"
foreach (var queueToken in queues)
{
#line default
#line hidden
WriteLiteral(" <li><a");
WriteAttribute("href", Tuple.Create(" href=\"", 1672), Tuple.Create("\"", 1729)
#line 35 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 1679), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Job.Queue(queueToken.JobQueue.Id))
#line default
#line hidden
, 1679), false)
);
WriteLiteral("><i");
WriteAttribute("class", Tuple.Create(" class=\"", 1733), Tuple.Create("\"", 1816)
, Tuple.Create(Tuple.Create("", 1741), Tuple.Create("fa", 1741), true)
, Tuple.Create(Tuple.Create(" ", 1743), Tuple.Create("fa-", 1744), true)
#line 35 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 1747), Tuple.Create<System.Object, System.Int32>(queueToken.JobQueue.Icon
#line default
#line hidden
, 1747), false)
, Tuple.Create(Tuple.Create(" ", 1774), Tuple.Create("fa-fw", 1775), true)
, Tuple.Create(Tuple.Create(" ", 1780), Tuple.Create("d-", 1781), true)
#line 35 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 1783), Tuple.Create<System.Object, System.Int32>(queueToken.JobQueue.IconColour
#line default
#line hidden
, 1783), false)
);
WriteLiteral("></i> ");
#line 35 "..\..\Views\Shared\_Layout.cshtml"
Write(queueToken.JobQueue.Name);
#line default
#line hidden
WriteLiteral("</a></li>\r\n");
#line 36 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
#line hidden
WriteLiteral(" </ul>\r\n " +
" </li>\r\n");
#line 39 "..\..\Views\Shared\_Layout.cshtml"
}
}
#line default
#line hidden
WriteLiteral(" ");
#line 41 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingTechnicianAction))
{
#line default
#line hidden
WriteLiteral(" <li>");
#line 43 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Technician Action", MVC.Job.AwaitingTechnicianAction()));
#line default
#line hidden
WriteLiteral("</li>\r\n");
#line 44 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 45 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.DevicesReadyForReturn))
{
@@ -177,7 +312,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" <li>");
#line 28 "..\..\Views\Shared\_Layout.cshtml"
#line 47 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn()));
@@ -186,7 +321,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 29 "..\..\Views\Shared\_Layout.cshtml"
#line 48 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -195,7 +330,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 30 "..\..\Views\Shared\_Layout.cshtml"
#line 49 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.Locations))
{
@@ -205,7 +340,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 32 "..\..\Views\Shared\_Layout.cshtml"
#line 51 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Device Held Locations", MVC.Job.Locations()));
@@ -214,7 +349,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 33 "..\..\Views\Shared\_Layout.cshtml"
#line 52 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -223,7 +358,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 34 "..\..\Views\Shared\_Layout.cshtml"
#line 53 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingUserAction))
{
@@ -233,7 +368,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 36 "..\..\Views\Shared\_Layout.cshtml"
#line 55 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction()));
@@ -242,7 +377,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 37 "..\..\Views\Shared\_Layout.cshtml"
#line 56 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -251,7 +386,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 38 "..\..\Views\Shared\_Layout.cshtml"
#line 57 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingFinance))
{
if (Authorization.HasAny(Claims.Job.Lists.AwaitingFinanceCharge, Claims.Job.Lists.AwaitingFinancePayment, Claims.Job.Lists.AwaitingFinanceAgreementBreach, Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
@@ -262,7 +397,7 @@ WriteLiteral(" ");
#line hidden
WriteLiteral(" <li");
WriteLiteral(" class=\"hasSubMenu\"");
WriteLiteral(" class=\"d-sm\"");
WriteLiteral("><i");
@@ -271,26 +406,22 @@ WriteLiteral(" class=\"fa fa-caret-right\"");
WriteLiteral("></i>");
#line 42 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
#line 61 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
#line default
#line hidden
WriteLiteral("\r\n <ul");
WriteLiteral(" class=\"subMenu\"");
WriteLiteral(">\r\n");
WriteLiteral("\r\n <ul>\r\n");
#line 44 "..\..\Views\Shared\_Layout.cshtml"
#line 63 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 44 "..\..\Views\Shared\_Layout.cshtml"
#line 63 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceCharge))
{
@@ -300,7 +431,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" <li>");
#line 46 "..\..\Views\Shared\_Layout.cshtml"
#line 65 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge()));
@@ -309,7 +440,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 47 "..\..\Views\Shared\_Layout.cshtml"
#line 66 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -318,7 +449,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 48 "..\..\Views\Shared\_Layout.cshtml"
#line 67 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingFinancePayment))
{
@@ -328,7 +459,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 50 "..\..\Views\Shared\_Layout.cshtml"
#line 69 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment()));
@@ -337,7 +468,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 51 "..\..\Views\Shared\_Layout.cshtml"
#line 70 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -346,7 +477,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 52 "..\..\Views\Shared\_Layout.cshtml"
#line 71 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceAgreementBreach))
{
@@ -356,7 +487,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 54 "..\..\Views\Shared\_Layout.cshtml"
#line 73 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach()));
@@ -365,7 +496,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 55 "..\..\Views\Shared\_Layout.cshtml"
#line 74 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -374,7 +505,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 56 "..\..\Views\Shared\_Layout.cshtml"
#line 75 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
{
@@ -384,7 +515,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 58 "..\..\Views\Shared\_Layout.cshtml"
#line 77 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing()));
@@ -393,7 +524,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 59 "..\..\Views\Shared\_Layout.cshtml"
#line 78 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -403,7 +534,7 @@ WriteLiteral(" </ul>\r\n
"\n");
#line 62 "..\..\Views\Shared\_Layout.cshtml"
#line 81 "..\..\Views\Shared\_Layout.cshtml"
}
else
{
@@ -414,7 +545,7 @@ WriteLiteral(" </ul>\r\n
WriteLiteral(" <li>");
#line 65 "..\..\Views\Shared\_Layout.cshtml"
#line 84 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
@@ -423,7 +554,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 66 "..\..\Views\Shared\_Layout.cshtml"
#line 85 "..\..\Views\Shared\_Layout.cshtml"
}
}
@@ -433,7 +564,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 68 "..\..\Views\Shared\_Layout.cshtml"
#line 87 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.DevicesAwaitingRepair))
{
@@ -443,7 +574,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 70 "..\..\Views\Shared\_Layout.cshtml"
#line 89 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair()));
@@ -452,7 +583,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 71 "..\..\Views\Shared\_Layout.cshtml"
#line 90 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -461,7 +592,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 72 "..\..\Views\Shared\_Layout.cshtml"
#line 91 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.AllOpen))
{
@@ -471,7 +602,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 74 "..\..\Views\Shared\_Layout.cshtml"
#line 93 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("All Open", MVC.Job.AllOpen()));
@@ -480,7 +611,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 75 "..\..\Views\Shared\_Layout.cshtml"
#line 94 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -489,7 +620,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" ");
#line 76 "..\..\Views\Shared\_Layout.cshtml"
#line 95 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Job.Lists.RecentlyClosed))
{
@@ -499,7 +630,7 @@ WriteLiteral(" ");
WriteLiteral(" <li>");
#line 78 "..\..\Views\Shared\_Layout.cshtml"
#line 97 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed()));
@@ -508,40 +639,73 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 79 "..\..\Views\Shared\_Layout.cshtml"
#line 98 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
#line hidden
WriteLiteral(" </ul>\r\n </li>\r\n <li" +
">");
"");
WriteAttribute("class", Tuple.Create(" class=\"", 6231), Tuple.Create("\"", 6319)
#line 82 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2"));
#line 101 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 6239), Tuple.Create<System.Object, System.Int32>((string)ViewContext.ViewData["MenuArea"] == MVC.Device.Name ? "active" : null
#line default
#line hidden
WriteLiteral("</li>\r\n <li>");
, 6239), false)
);
WriteLiteral(">");
#line 83 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3"));
#line 101 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2"));
#line default
#line hidden
WriteLiteral("</li>\r\n <li");
WriteLiteral(" class=\"moveRight\"");
WriteAttribute("class", Tuple.Create(" class=\"", 6414), Tuple.Create("\"", 6500)
#line 102 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 6422), Tuple.Create<System.Object, System.Int32>((string)ViewContext.ViewData["MenuArea"] == MVC.User.Name ? "active" : null
#line default
#line hidden
, 6422), false)
);
WriteLiteral(">");
#line 84 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
#line 102 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3"));
#line default
#line hidden
WriteLiteral("</li>\r\n <li");
WriteAttribute("class", Tuple.Create(" class=\"", 6591), Tuple.Create("\"", 6689)
, Tuple.Create(Tuple.Create("", 6599), Tuple.Create("moveRight", 6599), true)
#line 103 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 6608), Tuple.Create<System.Object, System.Int32>((string)ViewContext.ViewData["MenuArea"] == MVC.Public.Name ? " active" : null
#line default
#line hidden
, 6608), false)
);
WriteLiteral(">");
#line 103 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
#line default
@@ -549,24 +713,36 @@ WriteLiteral(">");
WriteLiteral("</li>\r\n");
#line 85 "..\..\Views\Shared\_Layout.cshtml"
#line 104 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 85 "..\..\Views\Shared\_Layout.cshtml"
#line 104 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.Config.Show))
{
#line default
#line hidden
WriteLiteral(" <li>");
WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 6867), Tuple.Create("\"", 6955)
#line 106 "..\..\Views\Shared\_Layout.cshtml"
, Tuple.Create(Tuple.Create("", 6875), Tuple.Create<System.Object, System.Int32>((string)ViewContext.ViewData["MenuArea"] == MVC.Config.Name ? "active" : null
#line default
#line hidden
, 6875), false)
);
WriteLiteral(">");
#line 87 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
#line 106 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
#line default
@@ -574,7 +750,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n");
#line 88 "..\..\Views\Shared\_Layout.cshtml"
#line 107 "..\..\Views\Shared\_Layout.cshtml"
}
@@ -587,21 +763,21 @@ WriteLiteral(" id=\"headerMenu\"");
WriteLiteral(">\r\n <span>");
#line 92 "..\..\Views\Shared\_Layout.cshtml"
#line 111 "..\..\Views\Shared\_Layout.cshtml"
if (Authorization.Has(Claims.User.Show))
{
#line default
#line hidden
#line 93 "..\..\Views\Shared\_Layout.cshtml"
#line 112 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id)));
#line default
#line hidden
#line 93 "..\..\Views\Shared\_Layout.cshtml"
#line 112 "..\..\Views\Shared\_Layout.cshtml"
}
else
{
@@ -609,14 +785,14 @@ WriteLiteral(">\r\n <span>");
#line default
#line hidden
#line 95 "..\..\Views\Shared\_Layout.cshtml"
#line 114 "..\..\Views\Shared\_Layout.cshtml"
Write(CurrentUser.ToString());
#line default
#line hidden
#line 95 "..\..\Views\Shared\_Layout.cshtml"
#line 114 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
@@ -624,28 +800,28 @@ WriteLiteral(">\r\n <span>");
WriteLiteral("</span>\r\n");
#line 96 "..\..\Views\Shared\_Layout.cshtml"
#line 115 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 96 "..\..\Views\Shared\_Layout.cshtml"
#line 115 "..\..\Views\Shared\_Layout.cshtml"
using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
{
#line default
#line hidden
#line 97 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s" }));
#line 116 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s", placeholder="Search" }));
#line default
#line hidden
#line 97 "..\..\Views\Shared\_Layout.cshtml"
}
#line 116 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
@@ -657,7 +833,7 @@ WriteLiteral(" id=\"layout_PageHeading\"");
WriteLiteral(">");
#line 100 "..\..\Views\Shared\_Layout.cshtml"
#line 119 "..\..\Views\Shared\_Layout.cshtml"
Write(CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty));
@@ -672,7 +848,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 102 "..\..\Views\Shared\_Layout.cshtml"
#line 121 "..\..\Views\Shared\_Layout.cshtml"
Write(RenderBody());
@@ -681,7 +857,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </section>\r\n <footer>\r\n Disco v");
#line 105 "..\..\Views\Shared\_Layout.cshtml"
#line 124 "..\..\Views\Shared\_Layout.cshtml"
Write(Disco.Web.DiscoApplication.Version);
@@ -692,7 +868,7 @@ WriteLiteral(" ");
WriteLiteral("@ ");
#line 105 "..\..\Views\Shared\_Layout.cshtml"
#line 124 "..\..\Views\Shared\_Layout.cshtml"
Write(Disco.Web.DiscoApplication.OrganisationName);
@@ -702,7 +878,7 @@ WriteLiteral(" | <a\r\n href=\"https://discoict.com.au/\" target=
"om.au</a> | ");
#line 106 "..\..\Views\Shared\_Layout.cshtml"
#line 125 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
@@ -711,7 +887,7 @@ WriteLiteral(" | <a\r\n href=\"https://discoict.com.au/\" target=
WriteLiteral(" | ");
#line 106 "..\..\Views\Shared\_Layout.cshtml"
#line 125 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
@@ -720,13 +896,13 @@ WriteLiteral(" | ");
WriteLiteral("\r\n </footer>\r\n </div>\r\n");
#line 109 "..\..\Views\Shared\_Layout.cshtml"
#line 128 "..\..\Views\Shared\_Layout.cshtml"
#line default
#line hidden
#line 109 "..\..\Views\Shared\_Layout.cshtml"
#line 128 "..\..\Views\Shared\_Layout.cshtml"
Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this);
#line default
Disco.Web/Views/Shared/_PublicLayout.cshtml
+1 -1
View File
@@ -19,7 +19,7 @@
</div>
<nav>
<ul id="menu">
<li>@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
<li class="active">@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
<li>@Html.ActionLink("Administration", MVC.Job.Index(), accesskey: "1")</li>
</ul>
</nav>
Disco.Web/Views/Shared/_PublicLayout.generated.cs
+6 -2
View File
@@ -125,11 +125,15 @@ WriteLiteral("></i></a>\r\n </div>\r\n <nav>\r\n
WriteLiteral(" id=\"menu\"");
WriteLiteral(">\r\n <li>");
WriteLiteral(">\r\n <li");
WriteLiteral(" class=\"active\"");
WriteLiteral(">");
#line 22 "..\..\Views\Shared\_PublicLayout.cshtml"
Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
#line default