From 3ae657f2ba2ee34bf27a9b0f136e776f4fe092e4 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 10 Feb 2014 17:16:31 +1100 Subject: [PATCH] Update Minor Job UI tweaks Job Queue 'Tasks' wording; Job ui-tabs item counting --- .../Areas/Config/Views/JobQueue/Show.cshtml | 4 +- .../Config/Views/JobQueue/Show.generated.cs | 427 +++++++++--------- Disco.Web/Views/Job/JobParts/Flags.cshtml | 4 +- .../Views/Job/JobParts/Flags.generated.cs | 25 +- .../Views/Job/JobParts/NonWarranty.cshtml | 2 +- .../Job/JobParts/NonWarranty.generated.cs | 14 +- Disco.Web/Views/Job/JobParts/_Subject.cshtml | 5 +- .../Views/Job/JobParts/_Subject.generated.cs | 169 +++---- Disco.Web/Views/Job/Show.cshtml | 6 +- Disco.Web/Views/Job/Show.generated.cs | 33 +- 10 files changed, 380 insertions(+), 309 deletions(-) diff --git a/Disco.Web/Areas/Config/Views/JobQueue/Show.cshtml b/Disco.Web/Areas/Config/Views/JobQueue/Show.cshtml index 823d876b..6067a341 100644 --- a/Disco.Web/Areas/Config/Views/JobQueue/Show.cshtml +++ b/Disco.Web/Areas/Config/Views/JobQueue/Show.cshtml @@ -7,6 +7,7 @@ var canConfig = Authorization.Has(Claims.Config.JobQueue.Configure); var canDelete = (Authorization.Has(Claims.Config.JobQueue.Delete) && Model.CanDelete); + var canShowJobs = Model.OpenJobCount > 0 && Authorization.Has(Claims.Job.Lists.JobQueueLists); Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers"); } @@ -620,7 +621,7 @@ -@if (canDelete) +@if (canDelete || canShowJobs) {
@Html.ActionLinkButton("Delete", MVC.API.JobQueue.Delete(Model.Token.JobQueue.Id, true), "Config_JobQueues_Actions_Delete_Button") @@ -660,5 +661,6 @@ }); }); + @Html.ActionLinkButton(string.Format("Show {0} job{1}", Model.OpenJobCount, (Model.OpenJobCount == 1 ? null : "s")), MVC.Job.Queue(Model.Token.JobQueue.Id), "Config_JobQueues_Actions_ShowJobs_Button")
} \ No newline at end of file diff --git a/Disco.Web/Areas/Config/Views/JobQueue/Show.generated.cs b/Disco.Web/Areas/Config/Views/JobQueue/Show.generated.cs index b67d7e85..6b963e91 100644 --- a/Disco.Web/Areas/Config/Views/JobQueue/Show.generated.cs +++ b/Disco.Web/Areas/Config/Views/JobQueue/Show.generated.cs @@ -59,6 +59,7 @@ namespace Disco.Web.Areas.Config.Views.JobQueue var canConfig = Authorization.Has(Claims.Config.JobQueue.Configure); var canDelete = (Authorization.Has(Claims.Config.JobQueue.Delete) && Model.CanDelete); + var canShowJobs = Model.OpenJobCount > 0 && Authorization.Has(Claims.Job.Lists.JobQueueLists); Html.BundleDeferred("~/ClientScripts/Modules/Disco-PropertyChangeHelpers"); @@ -82,7 +83,7 @@ WriteLiteral(">Id:\r\n \r\n \r\n"); WriteLiteral(" "); - #line 19 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 20 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Html.DisplayFor(model => model.Token.JobQueue.Id)); @@ -92,49 +93,49 @@ WriteLiteral("\r\n \r\n \r\n \r\n " \r\n "); - #line 25 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 26 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { #line default #line hidden - #line 26 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 27 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Html.EditorFor(model => model.Token.JobQueue.Name)); #line default #line hidden - #line 26 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 27 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 27 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 28 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 27 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 28 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 28 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 29 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 28 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 29 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" @@ -150,7 +151,7 @@ WriteLiteral(">\r\n $(function () {\r\n ""); - #line 34 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 35 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.UpdateName(Model.Token.JobQueue.Id))); @@ -160,7 +161,7 @@ WriteLiteral("\',\r\n \'QueueName\'\r\n " });\r\n \r\n"); - #line 39 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 40 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -169,14 +170,14 @@ WriteLiteral("\',\r\n \'QueueName\'\r\n #line default #line hidden - #line 42 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 43 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.Token.JobQueue.Name); #line default #line hidden - #line 42 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 43 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -187,49 +188,49 @@ WriteLiteral(" \r\n \r\n \r\n " \r\n "); - #line 49 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 50 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { #line default #line hidden - #line 50 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 51 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Html.EditorFor(model => model.Token.JobQueue.Description)); #line default #line hidden - #line 50 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 51 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 51 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 52 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 51 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 52 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 52 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 53 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 52 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 53 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" @@ -245,7 +246,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \'"); - #line 58 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 59 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.UpdateDescription(Model.Token.JobQueue.Id))); @@ -255,7 +256,7 @@ WriteLiteral("\',\r\n \'Description\'\r\n " });\r\n \r\n"); - #line 63 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 64 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -266,13 +267,13 @@ WriteLiteral("\',\r\n \'Description\'\r\n WriteLiteral(" 
\r\n");
 
             
-            #line 67 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
+            #line 68 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 67 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
+            #line 68 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
                      if (string.IsNullOrEmpty(Model.Token.JobQueue.Description))
                     {
 
@@ -286,7 +287,7 @@ WriteLiteral("<None>");
 WriteLiteral("\r\n");
 
             
-            #line 70 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
+            #line 71 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
                     }
                     else
                     {
@@ -295,14 +296,14 @@ WriteLiteral("\r\n");
             #line default
             #line hidden
             
-            #line 73 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
+            #line 74 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
                    Write(Model.Token.JobQueue.Description);
 
             
             #line default
             #line hidden
             
-            #line 73 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
+            #line 74 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
                                                          
                     }
 
@@ -312,7 +313,7 @@ WriteLiteral("\r\n");
 WriteLiteral("
\r\n"); - #line 76 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 77 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -322,7 +323,7 @@ WriteLiteral(" \r\n \r\n \r\n " \r\n \r\n
"); - #line 83 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 84 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.OpenJobCount); @@ -331,7 +332,7 @@ WriteLiteral(" \r\n \r\n \r\n WriteLiteral(" job"); - #line 83 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 84 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.OpenJobCount != 1 ? "s" : null); @@ -340,7 +341,7 @@ WriteLiteral(" job"); WriteLiteral(" open
\r\n
"); - #line 84 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 85 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.TotalJobCount); @@ -349,7 +350,7 @@ WriteLiteral(" open
\r\n
"); WriteLiteral(" total job"); - #line 84 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 85 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.TotalJobCount != 1 ? "s" : null); @@ -363,7 +364,7 @@ WriteLiteral(" id=\"Config_JobQueues_Icon\""); WriteLiteral(" data-icon=\""); - #line 91 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.Token.JobQueue.Icon); @@ -374,7 +375,7 @@ WriteLiteral("\""); WriteLiteral(" data-colour=\""); - #line 91 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.Token.JobQueue.IconColour); @@ -382,37 +383,37 @@ WriteLiteral(" data-colour=\""); #line hidden WriteLiteral("\""); -WriteAttribute("class", Tuple.Create(" class=\"", 3496), Tuple.Create("\"", 3581) -, Tuple.Create(Tuple.Create("", 3504), Tuple.Create("fa", 3504), true) -, Tuple.Create(Tuple.Create(" ", 3506), Tuple.Create("fa-", 3507), true) +WriteAttribute("class", Tuple.Create(" class=\"", 3596), Tuple.Create("\"", 3681) +, Tuple.Create(Tuple.Create("", 3604), Tuple.Create("fa", 3604), true) +, Tuple.Create(Tuple.Create(" ", 3606), Tuple.Create("fa-", 3607), true) - #line 91 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" - , Tuple.Create(Tuple.Create("", 3510), Tuple.Create(Model.Token.JobQueue.Icon + #line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + , Tuple.Create(Tuple.Create("", 3610), Tuple.Create(Model.Token.JobQueue.Icon #line default #line hidden -, 3510), false) -, Tuple.Create(Tuple.Create(" ", 3538), Tuple.Create("fa-4x", 3539), true) -, Tuple.Create(Tuple.Create(" ", 3544), Tuple.Create("d-", 3545), true) +, 3610), false) +, Tuple.Create(Tuple.Create(" ", 3638), Tuple.Create("fa-4x", 3639), true) +, Tuple.Create(Tuple.Create(" ", 3644), Tuple.Create("d-", 3645), true) - #line 91 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" - , Tuple.Create(Tuple.Create("", 3547), Tuple.Create(Model.Token.JobQueue.IconColour + #line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + , Tuple.Create(Tuple.Create("", 3647), Tuple.Create(Model.Token.JobQueue.IconColour #line default #line hidden -, 3547), false) +, 3647), false) ); WriteLiteral(">\r\n"); - #line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 93 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 93 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { @@ -442,13 +443,13 @@ WriteLiteral(" class=\"icons\""); WriteLiteral(">\r\n"); - #line 99 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 100 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 99 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 100 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" foreach (var icon in JobQueueService.Icons) { @@ -460,7 +461,7 @@ WriteLiteral("
\r\n "save() {\r\n var url = \'"); - #line 168 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 169 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.UpdateIconAndColour(id: Model.Token.JobQueue.Id, redirect: true))); @@ -636,7 +637,7 @@ WriteLiteral(@"', "); - #line 190 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 191 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -646,7 +647,7 @@ WriteLiteral(" \r\n \r\n \r\n " \r\n "); - #line 196 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 197 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { var priorityValue = Model.Token.JobQueue.Priority.ToString(); @@ -657,74 +658,74 @@ WriteLiteral(" \r\n \r\n \r\n #line hidden WriteLiteral(" (priorityValue.ToLower() + #line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 9476), Tuple.Create(priorityValue.ToLower() #line default #line hidden -, 9376), false) +, 9476), false) ); -WriteAttribute("title", Tuple.Create(" title=\"", 9403), Tuple.Create("\"", 9436) +WriteAttribute("title", Tuple.Create(" title=\"", 9503), Tuple.Create("\"", 9536) - #line 200 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" -, Tuple.Create(Tuple.Create("", 9411), Tuple.Create(priorityValue + #line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 9511), Tuple.Create(priorityValue #line default #line hidden -, 9411), false) -, Tuple.Create(Tuple.Create(" ", 9427), Tuple.Create("Priority", 9428), true) +, 9511), false) +, Tuple.Create(Tuple.Create(" ", 9527), Tuple.Create("Priority", 9528), true) ); WriteLiteral(">\r\n"); - #line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 202 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 202 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Html.DropDownListFor(m => m.Token.JobQueue.Priority, priorityItems)); #line default #line hidden - #line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 202 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 202 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 203 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 202 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 203 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 203 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 204 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 203 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 204 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" @@ -744,7 +745,7 @@ WriteLiteral(@"> '"); - #line 211 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 212 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.UpdatePriority(Model.Token.JobQueue.Id))); @@ -764,7 +765,7 @@ WriteLiteral(@"', "); - #line 222 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 223 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -773,14 +774,14 @@ WriteLiteral(@"', #line default #line hidden - #line 225 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 226 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Model.Token.JobQueue.Priority.ToString()); #line default #line hidden - #line 225 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 226 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -791,7 +792,7 @@ WriteLiteral(" \r\n \r\n \r\n " \r\n "); - #line 232 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 233 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { var slaOptions = JobQueueService.SlaOptions.Select(o => new SelectListItem() { Text = o.Value, Value = o.Key.ToString() }).ToList(); @@ -821,42 +822,42 @@ WriteLiteral(" \r\n \r\n \r\n #line default #line hidden - #line 256 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 257 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Html.DropDownListFor(m => m.Token.JobQueue.DefaultSLAExpiry, slaOptions)); #line default #line hidden - #line 256 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 257 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 257 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 258 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 257 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 258 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 258 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 259 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 258 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 259 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" @@ -874,7 +875,7 @@ WriteLiteral(@"> '"); - #line 264 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 265 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.UpdateDefaultSLAExpiry(Model.Token.JobQueue.Id))); @@ -884,7 +885,7 @@ WriteLiteral("\',\r\n \'DefaultSLAExpiry\'\r\n " });\r\n \r\n"); - #line 269 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 270 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -899,14 +900,14 @@ WriteLiteral("\',\r\n \'DefaultSLAExpiry\'\r\n #line default #line hidden - #line 278 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 279 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(slaOption[0].Value); #line default #line hidden - #line 278 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 279 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else @@ -922,7 +923,7 @@ WriteLiteral("<None>"); WriteLiteral("\r\n"); - #line 283 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 284 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } } else @@ -938,7 +939,7 @@ WriteLiteral("<None>"); WriteLiteral("\r\n"); - #line 288 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 289 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } } @@ -949,13 +950,13 @@ WriteLiteral(" \r\n \r\n \r\n "rs:\r\n \r\n"); - #line 295 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 296 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 295 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 296 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (Model.Token.SubjectIds.Count == 0) { @@ -969,7 +970,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">None Associated\r\n"); - #line 298 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 299 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -986,13 +987,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 302 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 303 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 302 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 303 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" foreach (var sg in Model.Subjects) { var displayName = sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id); @@ -1002,20 +1003,20 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (sg.IsGroup ? "group" : "user" + #line 306 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 14518), Tuple.Create(sg.IsGroup ? "group" : "user" #line default #line hidden -, 14418), false) +, 14518), false) ); WriteLiteral(">"); - #line 305 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 306 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (sg.IsGroup) { @@ -1029,20 +1030,20 @@ WriteLiteral(" class=\"fa fa-users fa-lg\""); WriteLiteral(">"); - #line 307 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 308 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 307 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 308 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(displayName); #line default #line hidden - #line 307 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 308 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else @@ -1053,14 +1054,14 @@ WriteLiteral(">"); #line hidden WriteLiteral(" (Url.Action(MVC.User.Show(sg.Id)) + #line 312 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 14997), Tuple.Create(Url.Action(MVC.User.Show(sg.Id)) #line default #line hidden -, 14897), false) +, 14997), false) ); WriteLiteral(">"); - #line 311 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 312 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(displayName); @@ -1079,7 +1080,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 312 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 313 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } #line default @@ -1087,7 +1088,7 @@ WriteLiteral("\r\n"); WriteLiteral("\r\n"); - #line 313 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 314 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1096,7 +1097,7 @@ WriteLiteral("\r\n"); WriteLiteral(" \r\n"); - #line 315 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 316 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1105,7 +1106,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" "); - #line 316 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 317 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { @@ -1147,13 +1148,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 324 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 325 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 324 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 325 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" foreach (var sg in Model.Subjects) { var displayName = sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id); @@ -1163,20 +1164,20 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (sg.IsGroup ? "group" : "user" + #line 328 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 16174), Tuple.Create(sg.IsGroup ? "group" : "user" #line default #line hidden -, 16074), false) +, 16174), false) ); WriteLiteral(" data-subjectid=\""); - #line 327 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 328 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(sg.Id); @@ -1187,7 +1188,7 @@ WriteLiteral("\""); WriteLiteral(">"); - #line 327 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 328 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (sg.IsGroup) { @@ -1201,20 +1202,20 @@ WriteLiteral(" class=\"fa fa-users fa-lg\""); WriteLiteral(">"); - #line 329 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 330 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 329 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 330 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(displayName); #line default #line hidden - #line 329 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 330 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else @@ -1230,20 +1231,20 @@ WriteLiteral(" class=\"fa fa-user fa-lg\""); WriteLiteral(">"); - #line 333 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 334 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 333 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 334 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(displayName); #line default #line hidden - #line 333 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 334 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1256,7 +1257,7 @@ WriteLiteral(" class=\"fa fa-times-circle remove\""); WriteLiteral(">\r\n"); - #line 335 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 336 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1285,14 +1286,14 @@ WriteLiteral(">Add\r\n \r\n WriteLiteral(" id=\"Config_JobQueues_Subjects_Update_Dialog_Form\""); -WriteAttribute("action", Tuple.Create(" action=\"", 17497), Tuple.Create("\"", 17589) +WriteAttribute("action", Tuple.Create(" action=\"", 17597), Tuple.Create("\"", 17689) - #line 342 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" - , Tuple.Create(Tuple.Create("", 17506), Tuple.Create(Url.Action(MVC.API.JobQueue.UpdateSubjects(Model.Token.JobQueue.Id, null, true)) + #line 343 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + , Tuple.Create(Tuple.Create("", 17606), Tuple.Create(Url.Action(MVC.API.JobQueue.UpdateSubjects(Model.Token.JobQueue.Id, null, true)) #line default #line hidden -, 17506), false) +, 17606), false) ); WriteLiteral(" method=\"post\""); @@ -1319,7 +1320,7 @@ WriteLiteral(">\r\n \r\n " .autocomplete({\r\n source: \'"); - #line 371 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 372 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.SearchSubjects())); @@ -1365,7 +1366,7 @@ WriteLiteral("\',\r\n minLength: "x({\r\n url: \'"); - #line 429 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 430 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Url.Action(MVC.API.JobQueue.Subject())); @@ -1420,7 +1421,7 @@ WriteLiteral("\',\r\n method: \'get\',\r\ "div>\r\n"); - #line 497 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 498 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1430,13 +1431,13 @@ WriteLiteral(" \r\n \r\n \r\n " Jobs:\r\n \r\n
\r\n"); - #line 504 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 505 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 504 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 505 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (Model.Token.JobQueue.JobSubTypes.Count > 0) { @@ -1446,13 +1447,13 @@ WriteLiteral(" \r\n \r\n \r\n WriteLiteral("
    \r\n"); - #line 507 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 508 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 507 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 508 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" foreach (var jobType in Model.Token.JobQueue.JobSubTypes.GroupBy(jst => jst.JobType).OrderBy(jtg => jtg.Key.Description)) { @@ -1464,7 +1465,7 @@ WriteLiteral("
  • \r\n"); WriteLiteral(" "); - #line 510 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 511 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(jobType.Key.Description); @@ -1473,13 +1474,13 @@ WriteLiteral(" "); WriteLiteral("\r\n
      \r\n"); - #line 512 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 513 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 512 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 513 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (jobType.Count() == Model.JobTypes.FirstOrDefault(jt => jt.Id == jobType.Key.Id).JobSubTypes.Count) { @@ -1493,7 +1494,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">[All Sub Types]\r\n"); - #line 515 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 516 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -1506,7 +1507,7 @@ WriteLiteral(">[All Sub Types]\r\n"); WriteLiteral("
    • "); - #line 520 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 521 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(jobSubType.Description); @@ -1515,7 +1516,7 @@ WriteLiteral("
    • "); WriteLiteral("
      • \r\n"); - #line 521 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 522 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } } @@ -1526,7 +1527,7 @@ WriteLiteral("
    \r\n "\n"); - #line 525 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 526 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1535,7 +1536,7 @@ WriteLiteral("
\r\n WriteLiteral(" \r\n"); - #line 527 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 528 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } else { @@ -1550,7 +1551,7 @@ WriteLiteral("<None>"); WriteLiteral("\r\n"); - #line 531 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 532 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1559,13 +1560,13 @@ WriteLiteral("\r\n"); WriteLiteral("
\r\n"); - #line 533 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 534 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 533 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 534 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" if (canConfig) { @@ -1593,13 +1594,13 @@ WriteLiteral(" title=\"Job Queue Automatic Types\""); WriteLiteral(">\r\n"); - #line 537 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 538 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" #line default #line hidden - #line 537 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 538 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" using (Html.BeginForm(MVC.API.JobQueue.UpdateJobSubTypes(Model.Token.JobQueue.Id, null, true))) { var selectedTypes = Model.Token.JobQueue.JobSubTypes.Select(jst => jst.JobType).Distinct().ToList(); @@ -1611,15 +1612,15 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (jt.Id + #line 543 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 28426), Tuple.Create(jt.Id #line default #line hidden -, 28326), false) +, 28426), false) ); WriteLiteral(" class=\"jobTypes\""); @@ -1627,35 +1628,35 @@ WriteLiteral(" class=\"jobTypes\""); WriteLiteral(">\r\n

\r\n (jt.Id + #line 545 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 28546), Tuple.Create(jt.Id #line default #line hidden -, 28446), false) +, 28546), false) ); WriteLiteral(" class=\"jobType\""); WriteLiteral(" type=\"checkbox\""); -WriteAttribute("value", Tuple.Create(" value=\"", 28487), Tuple.Create("\"", 28503) +WriteAttribute("value", Tuple.Create(" value=\"", 28587), Tuple.Create("\"", 28603) - #line 544 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" - , Tuple.Create(Tuple.Create("", 28495), Tuple.Create(jt.Id + #line 545 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + , Tuple.Create(Tuple.Create("", 28595), Tuple.Create(jt.Id #line default #line hidden -, 28495), false) +, 28595), false) ); WriteLiteral(" "); - #line 544 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 545 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(selectedTypes.Contains(jt) ? "checked=\"checked\"" : null); @@ -1663,21 +1664,21 @@ WriteLiteral(" "); #line hidden WriteLiteral(" />(jt.Id + #line 545 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + , Tuple.Create(Tuple.Create("", 28686), Tuple.Create(jt.Id #line default #line hidden -, 28586), false) +, 28686), false) ); WriteLiteral(">"); - #line 544 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 545 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(jt.Description); @@ -1685,15 +1686,15 @@ WriteLiteral(">"); #line hidden WriteLiteral("

\r\n (jt.Id + #line 546 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" +, Tuple.Create(Tuple.Create("", 28776), Tuple.Create(jt.Id #line default #line hidden -, 28676), false) +, 28776), false) ); WriteLiteral(" class=\"jobSubTypes\""); @@ -1703,7 +1704,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 546 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 547 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(CommonHelpers.CheckboxBulkSelect(string.Format("CheckboxBulkSelect_{0}", jt.Id), "div")); @@ -1714,7 +1715,7 @@ WriteLiteral("\r\n"); WriteLiteral(" "); - #line 547 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 548 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(CommonHelpers.CheckBoxList("JobSubTypes", jt.JobSubTypes.OrderBy(jst => jst.Description).ToSelectListItems(Model.Token.JobQueue.JobSubTypes), 2)); @@ -1724,7 +1725,7 @@ WriteLiteral("\r\n \r\n ""); - #line 550 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 551 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } } @@ -1772,7 +1773,7 @@ WriteLiteral(" \r\n"); - #line 615 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 616 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } @@ -1793,8 +1794,8 @@ WriteLiteral("> When jobs of these types are created, they will automat " \r\n\r\n"); - #line 623 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" - if (canDelete) + #line 624 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + if (canDelete || canShowJobs) { @@ -1809,7 +1810,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 626 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + #line 627 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" Write(Html.ActionLinkButton("Delete", MVC.API.JobQueue.Delete(Model.Token.JobQueue.Id, true), "Config_JobQueues_Actions_Delete_Button")); @@ -1859,11 +1860,21 @@ WriteLiteral(@"> }); }); - "); +WriteLiteral(" "); + #line 664 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" + Write(Html.ActionLinkButton(string.Format("Show {0} job{1}", Model.OpenJobCount, (Model.OpenJobCount == 1 ? null : "s")), MVC.Job.Queue(Model.Token.JobQueue.Id), "Config_JobQueues_Actions_ShowJobs_Button")); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n"); + + + #line 666 "..\..\Areas\Config\Views\JobQueue\Show.cshtml" } #line default diff --git a/Disco.Web/Views/Job/JobParts/Flags.cshtml b/Disco.Web/Views/Job/JobParts/Flags.cshtml index 64c8daa3..51d354d5 100644 --- a/Disco.Web/Views/Job/JobParts/Flags.cshtml +++ b/Disco.Web/Views/Job/JobParts/Flags.cshtml @@ -38,7 +38,7 @@ } } diff --git a/Disco.Web/Views/Job/JobParts/Flags.generated.cs b/Disco.Web/Views/Job/JobParts/Flags.generated.cs index 48dd6cb5..ab454666 100644 --- a/Disco.Web/Views/Job/JobParts/Flags.generated.cs +++ b/Disco.Web/Views/Job/JobParts/Flags.generated.cs @@ -29,6 +29,7 @@ namespace Disco.Web.Views.Job.JobParts using Disco; using Disco.BI.Extensions; using Disco.Models.Repository; + using Disco.Services; using Disco.Services.Authorization; using Disco.Services.Web; using Disco.Web; @@ -287,8 +288,17 @@ WriteLiteral(" - $('#jobDetailTabItems').append('
  • Flags
    • '); +WriteLiteral(">\r\n $(\'#jobDetailTabItems\').append(\'
  • " + +"Flags ["); + + + #line 41 "..\..\Views\Job\JobParts\Flags.cshtml" + Write(validFlags.SelectMany(g => g.Value).Count(f => f.Item3)); + + + #line default + #line hidden +WriteLiteral(@"]
    • '); $(function () { var $flagCheckboxes = $('#jobFlags').find('input[type=""checkbox""]'); var $dialogFlagsAction = $('#dialogFlagsAction'); @@ -362,7 +372,16 @@ WriteLiteral(@"', { Flag: '-' + flagValue }, function (response, result) { #line default #line hidden WriteLiteral(" \r\n"); +"tailTab-Flags\">Flags ["); + + + #line 98 "..\..\Views\Job\JobParts\Flags.cshtml" + Write(validFlags.SelectMany(g => g.Value).Count(f => f.Item3)); + + + #line default + #line hidden +WriteLiteral("]\');\r\n \r\n"); #line 100 "..\..\Views\Job\JobParts\Flags.cshtml" diff --git a/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml b/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml index 189c8d37..19ee30ac 100644 --- a/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml +++ b/Disco.Web/Views/Job/JobParts/NonWarranty.cshtml @@ -30,7 +30,7 @@ { \r\n"); +" var queueSLA = queue.attr(\'data-queuesla\');\r\n " + +" if (!queueSLA)\r\n queueSLA = 0;\r\n\r\n " + +" details.find(\'#Priority\').val(\'Normal\');\r\n " + +" details.find(\'#SLAExpiresMinutes\').val(queueSLA);\r\n\r\n " + +" details.show();\r\n }\r\n \r\n" + +" button.attr(\'href\', \'#\').click(function (e) {\r\n " + +" e.preventDefault();\r\n\r\n if (!butto" + +"nDialog){\r\n buttonDialog = $(\'#Job_Show_Job_Actio" + +"ns_AddQueue_Dialog\');\r\n buttonDialog.dialog({\r\n " + +" width: 600,\r\n " + +" height: 410,\r\n resizable: false,\r\n " + +" modal: true,\r\n au" + +"toOpen: false,\r\n buttons: {\r\n " + +" Cancel: function () {\r\n " + +" $(this).dialog(\"close\");\r\n },\r" + +"\n \"Add to Queue\": function () {\r\n " + +" var $this = $(this);\r\n " + +" $this.dialog(\"disable\");\r\n " + +" $this.dialog(\"option\", \"buttons\", null);\r\n " + +" buttonDialog.find(\'form\').submit();\r\n " + +" }\r\n }\r\n " + +" });\r\n\r\n queuePicker = buttonDialog.find(" + +"\'.queuePicker\');\r\n details = buttonDialog.find(\'." + +"details\');\r\n\r\n var priorityList = buttonDialog.fi" + +"nd(\'#Priority\');\r\n priorityList.change(function (" + +") {\r\n var icon = priorityList.closest(\'div\')." + +"find(\'i\').first();\r\n icon[0].className = \'\';\r" + +"\n icon.addClass(\'fa d-priority-\' + priorityLi" + +"st.val().toLowerCase()).attr(\'title\', priorityList.val() + \' Priority\');\r\n " + +" });\r\n\r\n queuePicker.on(" + +"\'click\', \'div.queue\', queueSelected);\r\n }\r\n\r\n " + +" buttonDialog.dialog(\'open\');\r\n re" + +"turn false;\r\n });\r\n });\r\n " + +" \r\n"); - #line 657 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 658 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2223,7 +2224,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 658 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 659 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogWarranty()) { @@ -2231,14 +2232,14 @@ WriteLiteral(" "); #line default #line hidden - #line 660 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 661 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Log Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button")); #line default #line hidden - #line 660 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 661 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2248,7 +2249,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 662 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 663 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWarrantyCompleted()) { @@ -2256,14 +2257,14 @@ WriteLiteral(" "); #line default #line hidden - #line 664 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 665 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Warranty Complete", MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_WarrantyComplete_Button", "alert")); #line default #line hidden - #line 664 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 665 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2273,7 +2274,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 666 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 667 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanInsuranceClaimFormSent()) { @@ -2281,14 +2282,14 @@ WriteLiteral(" "); #line default #line hidden - #line 668 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 669 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert")); #line default #line hidden - #line 668 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 669 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2298,7 +2299,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 670 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 671 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogRepair()) { @@ -2306,14 +2307,14 @@ WriteLiteral(" "); #line default #line hidden - #line 672 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 673 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Repairs Logged", MVC.API.Job.LogRepair(Model.Job.Id, null, null, true), "Job_Show_Job_Actions_LogRepair_Button")); #line default #line hidden - #line 672 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 673 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2330,13 +2331,13 @@ WriteLiteral(" title=\"Repairs Logged\""); WriteLiteral(">\r\n"); - #line 674 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 675 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 674 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 675 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.LogRepair(Model.Job.Id, null, null, true))) { @@ -2368,7 +2369,7 @@ WriteLiteral(" name=\"RepairerReference\""); WriteLiteral(" />\r\n

    \r\n"); - #line 684 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 685 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2406,7 +2407,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n });\r\n \r\n"); - #line 722 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 723 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2415,7 +2416,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 723 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 724 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanRepairComplete()) { @@ -2423,14 +2424,14 @@ WriteLiteral(" "); #line default #line hidden - #line 725 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 726 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Repairs Complete", MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_RepairComplete_Button", "alert")); #line default #line hidden - #line 725 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 726 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2440,7 +2441,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 727 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 728 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanConvertHWarToHNWar()) { @@ -2448,14 +2449,14 @@ WriteLiteral(" "); #line default #line hidden - #line 729 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 730 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button")); #line default #line hidden - #line 729 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 730 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2503,7 +2504,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n });\r\n \r\n"); - #line 769 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 770 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2512,13 +2513,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n"); - #line 771 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 772 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 771 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 772 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.Device != null) { @@ -2532,13 +2533,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\""); WriteLiteral(">\r\n"); - #line 774 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 775 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 774 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 775 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceHeld()) { @@ -2546,14 +2547,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 776 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Device Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button")); #line default #line hidden - #line 776 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2563,7 +2564,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 778 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 779 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReadyForReturn()) { @@ -2571,14 +2572,14 @@ WriteLiteral(" "); #line default #line hidden - #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 781 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Device Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert")); #line default #line hidden - #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 781 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2588,7 +2589,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 782 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 783 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReturned()) { @@ -2596,14 +2597,14 @@ WriteLiteral(" "); #line default #line hidden - #line 784 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 785 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Device Returned", MVC.API.Job.DeviceReturned(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReturned_Button", Model.Job.CanDeviceReadyForReturn() ? null : "alert")); #line default #line hidden - #line 784 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 785 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2613,7 +2614,7 @@ WriteLiteral(" "); WriteLiteral(" \r\n"); - #line 787 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 788 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2622,7 +2623,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" "); - #line 788 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 789 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -2636,13 +2637,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\""); WriteLiteral(">\r\n\r\n\r\n"); - #line 793 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 794 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 793 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 794 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWaitingForUserAction()) { @@ -2670,13 +2671,13 @@ WriteLiteral(" title=\"Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 797 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 798 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 797 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 798 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true))) { @@ -2694,7 +2695,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 803 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 804 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2729,7 +2730,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 836 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 837 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2738,7 +2739,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 837 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 838 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanNotWaitingForUserAction()) { @@ -2766,13 +2767,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 841 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 842 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 841 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 842 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true))) { @@ -2790,7 +2791,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 847 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 848 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2826,7 +2827,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 881 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 882 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2835,7 +2836,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral("\r\n \r\n"); - #line 884 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 885 "..\..\Views\Job\JobParts\_Subject.cshtml" } diff --git a/Disco.Web/Views/Job/Show.cshtml b/Disco.Web/Views/Job/Show.cshtml index 2ead61ee..10f27dff 100644 --- a/Disco.Web/Views/Job/Show.cshtml +++ b/Disco.Web/Views/Job/Show.cshtml @@ -67,7 +67,7 @@ @if (Authorization.HasAny(Claims.Job.ShowLogs, Claims.Job.ShowAttachments)) diff --git a/Disco.Web/Views/Job/Show.generated.cs b/Disco.Web/Views/Job/Show.generated.cs index 4f202679..f4420a39 100644 --- a/Disco.Web/Views/Job/Show.generated.cs +++ b/Disco.Web/Views/Job/Show.generated.cs @@ -269,7 +269,16 @@ WriteLiteral("
  • Log and Attachments
    • \r\n"); +WriteLiteral(">Log and Attachments ["); + + + #line 70 "..\..\Views\Job\Show.cshtml" + Write(Model.Job.JobAttachments.Count); + + + #line default + #line hidden +WriteLiteral("]\r\n"); #line 71 "..\..\Views\Job\Show.cshtml" @@ -299,7 +308,16 @@ WriteLiteral("
  • Attachments
    • \r\n"); +WriteLiteral(">Attachments ["); + + + #line 78 "..\..\Views\Job\Show.cshtml" + Write(Model.Job.JobAttachments.Count); + + + #line default + #line hidden +WriteLiteral("]\r\n"); #line 79 "..\..\Views\Job\Show.cshtml" @@ -322,7 +340,16 @@ WriteLiteral("
  • Queues
    • \r\n"); +WriteLiteral(">Queues ["); + + + #line 82 "..\..\Views\Job\Show.cshtml" + Write(Model.Job.JobQueues.Count(jq => !jq.RemovedDate.HasValue)); + + + #line default + #line hidden +WriteLiteral("]\r\n"); #line 83 "..\..\Views\Job\Show.cshtml"