diff --git a/Disco.Data/Configuration/Modules/JobPreferencesConfiguration.cs b/Disco.Data/Configuration/Modules/JobPreferencesConfiguration.cs index 2661e826..7a88628e 100644 --- a/Disco.Data/Configuration/Modules/JobPreferencesConfiguration.cs +++ b/Disco.Data/Configuration/Modules/JobPreferencesConfiguration.cs @@ -12,6 +12,15 @@ namespace Disco.Data.Configuration.Modules public override string Scope { get { return "JobPreferences"; } } + /// + /// Initial comments template for new jobs + /// + public string InitialCommentsTemplate + { + get { return Get(null); } + set { Set(value); } + } + /// /// Number of days a job is open before it is considered 'Long Running' /// diff --git a/Disco.Models/UI/Config/JobPreferences/ConfigJobPreferencesIndexModel.cs b/Disco.Models/UI/Config/JobPreferences/ConfigJobPreferencesIndexModel.cs index f0f46f87..70405a46 100644 --- a/Disco.Models/UI/Config/JobPreferences/ConfigJobPreferencesIndexModel.cs +++ b/Disco.Models/UI/Config/JobPreferences/ConfigJobPreferencesIndexModel.cs @@ -5,12 +5,15 @@ namespace Disco.Models.UI.Config.JobPreferences { public interface ConfigJobPreferencesIndexModel : BaseUIModel { + string InitialCommentsTemplate { get; set; } int LongRunningJobDaysThreshold { get; set; } int StaleJobMinutesThreshold { get; set; } + bool LodgmentIncludeAllAttachmentsByDefault { get; set; } LocationModes LocationMode { get; set; } List LocationList { get; set; } string OnCreateExpression { get; set; } + string OnDeviceReadyForReturnExpression { get; set; } string OnCloseExpression { get; set; } List> LongRunningJobDaysThresholdOptions(); diff --git a/Disco.Models/UI/Job/JobCreateModel.cs b/Disco.Models/UI/Job/JobCreateModel.cs index cbedc49a..d9480abc 100644 --- a/Disco.Models/UI/Job/JobCreateModel.cs +++ b/Disco.Models/UI/Job/JobCreateModel.cs @@ -11,6 +11,7 @@ namespace Disco.Models.UI.Job List SubTypes { get; set; } string Comments { get; set; } + bool RegenerateCommentsOnTypeChange { get; set; } bool? DeviceHeld { get; set; } diff --git a/Disco.Services/Jobs/Jobs.cs b/Disco.Services/Jobs/Jobs.cs index 7bf9eefd..e1e6ebc8 100644 --- a/Disco.Services/Jobs/Jobs.cs +++ b/Disco.Services/Jobs/Jobs.cs @@ -1,7 +1,9 @@ using Disco.Data.Repository; using Disco.Models.Repository; +using Disco.Models.UI.Job; using Disco.Services.Expressions; using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text; @@ -10,7 +12,6 @@ namespace Disco.Services.Jobs { public static class Jobs { - public static Job Create(DiscoDataContext Database, Device device, User user, JobType type, List subTypes, User initialTech, bool addAutoQueues = true) { Job j = new Job() @@ -151,5 +152,47 @@ namespace Disco.Services.Jobs ExpressionCache.InvalidateSingleCache("Job_OnCloseExpression"); } + public static Expression InitialCommentsTemplateFromCache(DiscoDataContext database) + { + return ExpressionCache.GetOrCreateSingleExpressions("Job_InitialCommentsTemplate", () => Expression.Tokenize(null, database.DiscoConfiguration.JobPreferences.InitialCommentsTemplate ?? string.Empty, 0, false, false)); + } + + public static void InitialCommentsTemplateInvalidateCache() + { + ExpressionCache.InvalidateSingleCache("Job_InitialCommentsTemplate"); + } + + public static string GenerateInitialComments(DiscoDataContext database, JobCreateModel createModel, User techUser, out bool isTypeDynamic) + { + var type = createModel.JobTypes.First(t => t.Id == createModel.Type); + var subTypes = default(List); + if (createModel.SubTypes != null && createModel.SubTypes.Count > 0) + subTypes = type.JobSubTypes.Where(s => createModel.SubTypes.Contains(s.Id)).Select(s => s.Description).ToList(); + else + subTypes = new List(); + + return GenerateInitialComments(database, createModel.Device, createModel.User, type.Description, subTypes, techUser, out isTypeDynamic); + } + + public static string GenerateInitialComments(DiscoDataContext database, Device device, User user, string jobTypeDescription, List jobSubTypeDescriptions, User techUser, out bool isTypeDynamic) + { + var expression = InitialCommentsTemplateFromCache(database); + + IDictionary evaluatorVariables = Expression.StandardVariables(null, database, user, DateTime.Now, null, (IAttachmentTarget)user ?? device); + + evaluatorVariables["TechUser"] = techUser; + // User is part of the StandardVariables + evaluatorVariables["Device"] = device; + evaluatorVariables["JobType"] = jobTypeDescription; + evaluatorVariables["JobSubTypes"] = jobSubTypeDescriptions; + + var result = expression.Evaluate(techUser, evaluatorVariables); + + isTypeDynamic = expression.Source.IndexOf("#JobType", StringComparison.OrdinalIgnoreCase) >= 0 || + expression.Source.IndexOf("#JobSubTypes", StringComparison.OrdinalIgnoreCase) >= 0; + + return result.Item1; + } + } } diff --git a/Disco.Web/Areas/API/Controllers/JobController.cs b/Disco.Web/Areas/API/Controllers/JobController.cs index b8bff874..95406a1b 100644 --- a/Disco.Web/Areas/API/Controllers/JobController.cs +++ b/Disco.Web/Areas/API/Controllers/JobController.cs @@ -6,6 +6,7 @@ using Disco.Services; using Disco.Services.Authorization; using Disco.Services.Exporting; using Disco.Services.Interop; +using Disco.Services.Jobs; using Disco.Services.Jobs.Exporting; using Disco.Services.Jobs.JobLists; using Disco.Services.Jobs.Statistics; @@ -1809,6 +1810,15 @@ namespace Disco.Web.Areas.API.Controllers #endregion #region Job Comments + + [HttpPost, ValidateAntiForgeryToken, DiscoAuthorize(Claims.Job.Actions.Create)] + public virtual ActionResult InitialComments(CreateModel m) + { + m.UpdateModel(Database, Authorization); + + return Json(Jobs.GenerateInitialComments(Database, m, CurrentUser, out _)); + } + [DiscoAuthorize(Claims.Job.ShowLogs)] public virtual ActionResult Comments(int id) { diff --git a/Disco.Web/Areas/API/Controllers/JobPreferencesController.cs b/Disco.Web/Areas/API/Controllers/JobPreferencesController.cs index a71015f0..7947dd9e 100644 --- a/Disco.Web/Areas/API/Controllers/JobPreferencesController.cs +++ b/Disco.Web/Areas/API/Controllers/JobPreferencesController.cs @@ -11,6 +11,30 @@ namespace Disco.Web.Areas.API.Controllers { public partial class JobPreferencesController : AuthorizedDatabaseController { + [DiscoAuthorize(Claims.Config.JobPreferences.Configure)] + public virtual ActionResult UpdateInitialCommentsTemplate(string initialCommentsTemplate, bool redirect = false) + { + string expression = null; + + if (!string.IsNullOrWhiteSpace(initialCommentsTemplate)) + { + expression = initialCommentsTemplate.Trim(); + } + + if (Database.DiscoConfiguration.JobPreferences.InitialCommentsTemplate != expression) + { + Database.DiscoConfiguration.JobPreferences.InitialCommentsTemplate = expression; + Database.SaveChanges(); + + Jobs.InitialCommentsTemplateInvalidateCache(); + } + + if (redirect) + return RedirectToAction(MVC.Config.JobPreferences.Index()); + else + return Json("OK", JsonRequestBehavior.AllowGet); + } + [DiscoAuthorize(Claims.Config.JobPreferences.Configure)] public virtual ActionResult UpdateLongRunningJobDaysThreshold(int LongRunningJobDaysThreshold, bool redirect = false) { diff --git a/Disco.Web/Areas/Config/Controllers/JobPreferencesController.cs b/Disco.Web/Areas/Config/Controllers/JobPreferencesController.cs index d2cc435f..e2ea7c1a 100644 --- a/Disco.Web/Areas/Config/Controllers/JobPreferencesController.cs +++ b/Disco.Web/Areas/Config/Controllers/JobPreferencesController.cs @@ -13,6 +13,7 @@ namespace Disco.Web.Areas.Config.Controllers { var m = new Models.JobPreferences.IndexModel() { + InitialCommentsTemplate = Database.DiscoConfiguration.JobPreferences.InitialCommentsTemplate, LongRunningJobDaysThreshold = Database.DiscoConfiguration.JobPreferences.LongRunningJobDaysThreshold, StaleJobMinutesThreshold = Database.DiscoConfiguration.JobPreferences.StaleJobMinutesThreshold, LodgmentIncludeAllAttachmentsByDefault = Database.DiscoConfiguration.JobPreferences.LodgmentIncludeAllAttachmentsByDefault, diff --git a/Disco.Web/Areas/Config/Models/JobPreferences/IndexModel.cs b/Disco.Web/Areas/Config/Models/JobPreferences/IndexModel.cs index 37afbd18..c175ab4d 100644 --- a/Disco.Web/Areas/Config/Models/JobPreferences/IndexModel.cs +++ b/Disco.Web/Areas/Config/Models/JobPreferences/IndexModel.cs @@ -11,6 +11,8 @@ namespace Disco.Web.Areas.Config.Models.JobPreferences { public class IndexModel : ConfigJobPreferencesIndexModel { + [DataType(DataType.MultilineText)] + public string InitialCommentsTemplate { get; set; } public int LongRunningJobDaysThreshold { get; set; } public int StaleJobMinutesThreshold { get; set; } public bool LodgmentIncludeAllAttachmentsByDefault { get; set; } diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Index.cshtml b/Disco.Web/Areas/Config/Views/JobPreferences/Index.cshtml index 4e86b462..e05a95d0 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Index.cshtml +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Index.cshtml @@ -12,7 +12,6 @@ Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); } Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.General); - Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Lodgment); Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Reports); Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Locations); Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Expressions); diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Index.generated.cs b/Disco.Web/Areas/Config/Views/JobPreferences/Index.generated.cs index 27f387a3..32ad9eac 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Index.generated.cs +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Index.generated.cs @@ -58,7 +58,6 @@ namespace Disco.Web.Areas.Config.Views.JobPreferences Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); } Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.General); - Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Lodgment); Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Reports); Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Locations); Html.RenderPartial(MVC.Config.JobPreferences.Views.Parts.Expressions); diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.cshtml b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.cshtml index 8086a3c8..5548122a 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.cshtml +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.cshtml @@ -8,7 +8,7 @@

Expressions

- + - + - +
On Create:On Create: @if (canConfig) { @@ -76,7 +76,7 @@
On Device Ready For Return:On Device Ready For Return: @if (canConfig) { @@ -144,7 +144,7 @@
On Close:On Close: @if (canConfig) { diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.generated.cs b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.generated.cs index c7d8e498..e4d3522a 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.generated.cs +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Expressions.generated.cs @@ -63,7 +63,7 @@ WriteLiteral(" style=\"width: 530px;\""); WriteLiteral(">\r\n

Expressions

\r\n \r\n \r\n On Create:\r\n \r\n \r\n \r\n " + -" On Device Ready For Return:\r\n + + + + - On Close:\r\n +
\r\n"); @@ -243,14 +243,15 @@ WriteLiteral(">\r\n This expression will be evaluated whenever a job is created. If the expressi" + -"on has any output it will be added to the job log.\r\n

\r\n " + -" \r\n
\r\n"); +WriteLiteral(@">This expression will be evaluated whenever a job is created. If the expression has any output it will be added to the job log. +

+ +
On Device Ready For Return: +"); #line 81 "..\..\Areas\Config\Views\JobPreferences\Parts\Expressions.cshtml" @@ -444,11 +445,9 @@ WriteLiteral(@">This expression will be evaluated whenever a device is flagg
\r\n"); + On Close: +"); #line 149 "..\..\Areas\Config\Views\JobPreferences\Parts\Expressions.cshtml" diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.cshtml b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.cshtml index 2aeaac60..27dae26f 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.cshtml +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.cshtml @@ -4,18 +4,93 @@ var canConfig = Authorization.Has(Claims.Config.JobPreferences.Configure); } -
+

General Preferences

- - + + + + - - + + + +
Long Running Threshold: - @if (canConfig) + +
Initial Comments Template:
+ @if (canConfig) { - @Html.DropDownListFor(model => model.LongRunningJobDaysThreshold, Model.LongRunningJobDaysThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value })) - @AjaxHelpers.AjaxSave() - @AjaxHelpers.AjaxLoader() - + } + else + { + if (string.IsNullOrWhiteSpace(Model.InitialCommentsTemplate)) + { + <None Specified> + } + else + { +
+ @Model.InitialCommentsTemplate +
+ } + } +
+

+ This template is added to the Comments box shown when creating a job. Expressions can be included. Add expressions inside curly braces, for example: +

Justification for {#JobType}:
+

+

+ The following additional variables are available: +

    +
  • #TechUser: The user creating the job
    • +
  • #User: The user linked to the job (or null if no user is associated)
    • +
  • #Device: The user linked to the job (or null if no user is associated)
    • +
  • #JobType: The selected job type (for example 'Hardware - Warranty')
    • +
  • #JobSubTypes: A list of selected job sub-types (for example ['Motherboard', 'Screen'])
    • +
+

+
+
+ Long Running Threshold: + + @if (canConfig) + { + @Html.DropDownListFor(model => model.LongRunningJobDaysThreshold, Model.LongRunningJobDaysThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value })) + @AjaxHelpers.AjaxSave() + @AjaxHelpers.AjaxLoader() + + } else { - @Model.LongRunningJobDaysThresholdOptions().First(o => o.Key == Model.LongRunningJobDaysThreshold).Value + @Model.LongRunningJobDaysThresholdOptions().First(o => o.Key == Model.LongRunningJobDaysThreshold).Value }
Jobs which have been open for longer than the threshold are considered 'long-running' and will appear in the Long Running Jobs list.
- @if (Authorization.Has(Claims.Job.Lists.LongRunningJobs)) { @Html.ActionLinkSmallButton("Show Long Running Jobs", MVC.Job.LongRunning()) } + @if (Authorization.Has(Claims.Job.Lists.LongRunningJobs)) + {@Html.ActionLinkSmallButton("Show Long Running Jobs", MVC.Job.LongRunning())}
Stale Threshold: + + Stale Threshold: @if (canConfig) + + @if (canConfig) { - @Html.DropDownListFor(model => model.StaleJobMinutesThreshold, Model.StaleJobMinutesThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value })) - @AjaxHelpers.AjaxSave() - @AjaxHelpers.AjaxLoader() - + } else { - @Model.StaleJobMinutesThresholdOptions().First(o => o.Key == Model.StaleJobMinutesThreshold).Value + @Model.StaleJobMinutesThresholdOptions().First(o => o.Key == Model.StaleJobMinutesThreshold).Value }
Jobs which have no recoded action for longer than the threshold are considered 'stale' and will appear in the Stale Jobs list.
- @if (Authorization.Has(Claims.Job.Lists.LongRunningJobs)) { @Html.ActionLinkSmallButton("Show Stale Jobs", MVC.Job.Stale()) } + @if (Authorization.Has(Claims.Job.Lists.LongRunningJobs)) + {@Html.ActionLinkSmallButton("Show Stale Jobs", MVC.Job.Stale())} +
+ Lodgment: + + @if (canConfig) + { + @Html.CheckBoxFor(model => model.LodgmentIncludeAllAttachmentsByDefault) + + @AjaxHelpers.AjaxSave() + @AjaxHelpers.AjaxLoader() +
+

+ If enabled, all attachments will be selected by default when lodging a job. +

+
+ + } + else + { + + @(Model.LodgmentIncludeAllAttachmentsByDefault ? "Yes" : "No") + + }
diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.generated.cs b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.generated.cs index 69080476..e64f75b7 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.generated.cs +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/General.generated.cs @@ -55,67 +55,284 @@ namespace Disco.Web.Areas.Config.Views.JobPreferences.Parts #line hidden WriteLiteral("\r\n\r\n

General Preferences

\r\n \r\n \r\n \r\n

General Preferences

\r\n
\r\n \r\n Long Running Threshold:\r\n \r\n + + + \r\n Long Running Threshold:\r\n \r\n \r\n \r\n \r\n Stale Threshold:\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
"); +WriteLiteral(">\r\n
Initial Comments Template:
\r\n"); + #line 13 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + #line default + #line hidden + #line 13 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" if (canConfig) { - + #line default #line hidden #line 15 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(Html.DropDownListFor(model => model.LongRunningJobDaysThreshold, Model.LongRunningJobDaysThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value }))); + Write(Html.EditorFor(model => model.InitialCommentsTemplate)); #line default #line hidden #line 15 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - - + + #line default #line hidden #line 16 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(AjaxHelpers.AjaxSave()); + Write(AjaxHelpers.AjaxRemove()); #line default #line hidden #line 16 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - + + + + #line default + #line hidden + + #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxSave()); + + + #line default + #line hidden + + #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + + #line default + #line hidden + + #line 18 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxLoader()); + + + #line default + #line hidden + + #line 18 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + + #line default + #line hidden +WriteLiteral(" + $(function () { + var field = $('#InitialCommentsTemplate'); + var fieldRemove = field.next('.ajaxRemove'); + var fieldOriginalWidth, fieldOriginalHeight; + + document.DiscoFunctions.PropertyChangeHelper( + field, + 'None', + '"); + + + #line 28 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Url.Action(MVC.API.JobPreferences.UpdateInitialCommentsTemplate())); + + + #line default + #line hidden +WriteLiteral(@"', + 'initialCommentsTemplate' + ); + + field.change(function () { + if (!!field.val()) { + fieldRemove.show(); + } else { + fieldRemove.hide(); + } + }).attr('placeholder', 'None'); + + fieldRemove.click(function () { + field.val('').trigger('change'); + }); + + if (!!field.val()) { + fieldRemove.show(); + } else { + fieldRemove.hide(); + } + }); + +"); + + + #line 51 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } + else + { + if (string.IsNullOrWhiteSpace(Model.InitialCommentsTemplate)) + { + + + #line default + #line hidden +WriteLiteral(" <None Specified>\r\n"); + + + #line 57 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } + else + { + + + #line default + #line hidden +WriteLiteral(" \r\n"); + +WriteLiteral(" "); + + + #line 61 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Model.InitialCommentsTemplate); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n"); + + + #line 63 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } + } + + + #line default + #line hidden +WriteLiteral(" \r\n \r\n This template is added to the Comments box shown when creating a job. Expres" + +"sions can be included. Add expressions inside curly braces, for example:\r\n " + +" Justification for {#JobType}: +

+

+ The following additional variables are available: +

    +
  • #TechUser: The user creating the job
    • +
  • #User: The user linked to the job (or null if no user is associated)
    • +
  • #Device: The user linked to the job (or null if no user is associated)
    • +
  • #JobType: The selected job type (for example 'Hardware - Warranty')
    • +
  • #JobSubTypes: A list of selected job sub-types (for example ['Motherboard', 'Screen'])
    • +
+

+ +
\r\n" + +""); + + + #line 88 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" #line default #line hidden - #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(AjaxHelpers.AjaxLoader()); + #line 88 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + if (canConfig) + { + + + #line default + #line hidden + + #line 90 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Html.DropDownListFor(model => model.LongRunningJobDaysThreshold, Model.LongRunningJobDaysThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value }))); #line default #line hidden - #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - + #line 90 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + + #line default + #line hidden + + #line 91 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxSave()); #line default #line hidden -WriteLiteral("
"); +WriteLiteral("
\r\n " + +" Stale Threshold:\r\n \r\n"); - #line 41 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + #line default + #line hidden + + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" if (canConfig) { - + #line default #line hidden - #line 43 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(Html.DropDownListFor(model => model.StaleJobMinutesThreshold, Model.StaleJobMinutesThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value }))); + #line 121 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Html.DropDownListFor(model => model.StaleJobMinutesThreshold, Model.StaleJobMinutesThresholdOptions().Select(o => new SelectListItem() { Value = o.Key.ToString(), Text = o.Value }))); #line default #line hidden - #line 43 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - - + #line 121 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + #line default #line hidden - #line 44 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(AjaxHelpers.AjaxSave()); + #line 122 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 44 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - - + #line 122 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + #line default #line hidden - #line 45 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(AjaxHelpers.AjaxLoader()); + #line 123 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 45 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - + #line 123 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + #line default #line hidden -WriteLiteral(" \r\n $(function () {\r\n "eshold\'),\r\n null,\r\n \'"); - #line 51 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + #line 129 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" Write(Url.Action(MVC.API.JobPreferences.UpdateStaleJobMinutesThreshold())); #line default #line hidden WriteLiteral("\',\r\n \'StaleJobMinutesThreshold\');\r\n " + -" });\r\n \r\n"); +" });\r\n \r\n"); - #line 55 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + #line 133 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" } else { - + #line default #line hidden - #line 58 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(Model.StaleJobMinutesThresholdOptions().First(o => o.Key == Model.StaleJobMinutesThreshold).Value); + #line 136 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Model.StaleJobMinutesThresholdOptions().First(o => o.Key == Model.StaleJobMinutesThreshold).Value); #line default #line hidden - #line 58 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - + #line 136 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } @@ -298,27 +519,161 @@ WriteLiteral(">\r\n Jobs which have no recoded action for lon ".\r\n \r\n"); - #line 63 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + #line 141 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" #line default #line hidden - #line 63 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - if (Authorization.Has(Claims.Job.Lists.LongRunningJobs)) { + #line 141 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + if (Authorization.Has(Claims.Job.Lists.LongRunningJobs)) + { #line default #line hidden - #line 63 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - Write(Html.ActionLinkSmallButton("Show Stale Jobs", MVC.Job.Stale())); + #line 142 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Html.ActionLinkSmallButton("Show Stale Jobs", MVC.Job.Stale())); #line default #line hidden - #line 63 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" - } + #line 142 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } + + + #line default + #line hidden +WriteLiteral("
\r\n " + +" Lodgment:\r\n \r\n"); + + + #line 150 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + #line default + #line hidden + + #line 150 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + if (canConfig) + { + + + #line default + #line hidden + + #line 152 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Html.CheckBoxFor(model => model.LodgmentIncludeAllAttachmentsByDefault)); + + + #line default + #line hidden + + #line 152 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + + #line default + #line hidden +WriteLiteral(" Include All Attachments by Default\r\n"); + + + #line 154 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + #line default + #line hidden + + #line 154 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxSave()); + + + #line default + #line hidden + + #line 154 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + + #line default + #line hidden + + #line 155 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(AjaxHelpers.AjaxLoader()); + + + #line default + #line hidden + + #line 155 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + + + + #line default + #line hidden +WriteLiteral(" \r\n \r\n If enabled, all attachments will be selected by default when lodging a job.\r" + +"\n

\r\n \r\n"); + +WriteLiteral(" \r\n $(function () {\r\n document.DiscoFunctions.PropertyC" + +"hangeHelper(\r\n $(\'#LodgmentIncludeAllAttachmentsByDefault\'),\r" + +"\n null,\r\n \'"); + + + #line 166 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Url.Action(MVC.API.JobPreferences.UpdateLodgmentIncludeAllAttachmentsByDefault())); + + + #line default + #line hidden +WriteLiteral("\',\r\n \'includeAllAttachmentsByDefault\');\r\n });\r\n " + +" \r\n"); + + + #line 170 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } + else + { + + + #line default + #line hidden +WriteLiteral(" \r\n"); + +WriteLiteral(" "); + + + #line 174 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + Write(Model.LodgmentIncludeAllAttachmentsByDefault ? "Yes" : "No"); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n"); + + + #line 176 "..\..\Areas\Config\Views\JobPreferences\Parts\General.cshtml" + } #line default diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.cshtml b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.cshtml index c50ada54..3eefcd10 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.cshtml +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.cshtml @@ -8,7 +8,7 @@

Job Locations

-
Mode: + Mode: @if (canConfig) { diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.generated.cs b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.generated.cs index 577e0b28..2d78ae41 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.generated.cs +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Locations.generated.cs @@ -63,7 +63,7 @@ WriteLiteral(" style=\"width: 530px;\""); WriteLiteral(">\r\n

Job Locations

\r\n \r\n \r\n Mode:\r\n \r\n
"); diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Lodgment.cshtml b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Lodgment.cshtml deleted file mode 100644 index fa41f309..00000000 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Lodgment.cshtml +++ /dev/null @@ -1,45 +0,0 @@ -@model Disco.Web.Areas.Config.Models.JobPreferences.IndexModel -@{ - Authorization.Require(Claims.Config.JobPreferences.Show); - - var canConfig = Authorization.Has(Claims.Config.JobPreferences.Configure); -} -
-

Job Lodgment

- - - - - -
-   - - @if (canConfig) - { - @Html.CheckBoxFor(model => model.LodgmentIncludeAllAttachmentsByDefault) - - @AjaxHelpers.AjaxSave() - @AjaxHelpers.AjaxLoader() -
-

- If enabled, all attachments will be selected by default when lodging a job. -

-
- - } - else - { - - @(Model.LodgmentIncludeAllAttachmentsByDefault ? "Yes" : "No") - - } -
-
diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Lodgment.generated.cs b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Lodgment.generated.cs deleted file mode 100644 index f398e2e0..00000000 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Lodgment.generated.cs +++ /dev/null @@ -1,206 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Disco.Web.Areas.Config.Views.JobPreferences.Parts -{ - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Net; - using System.Text; - using System.Web; - using System.Web.Helpers; - using System.Web.Mvc; - using System.Web.Mvc.Ajax; - using System.Web.Mvc.Html; - using System.Web.Routing; - using System.Web.Security; - using System.Web.UI; - using System.Web.WebPages; - using Disco; - using Disco.Models.Repository; - using Disco.Services; - using Disco.Services.Authorization; - using Disco.Services.Web; - using Disco.Web; - using Disco.Web.Extensions; - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/JobPreferences/Parts/Lodgment.cshtml")] - public partial class Lodgment : Disco.Services.Web.WebViewPage - { - public Lodgment() - { - } - public override void Execute() - { - - #line 2 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - - Authorization.Require(Claims.Config.JobPreferences.Show); - - var canConfig = Authorization.Has(Claims.Config.JobPreferences.Configure); - - - #line default - #line hidden -WriteLiteral("\r\n\r\n

Job Lodgment

\r\n \r\n \r\n \r\n  \r\n \r\n \r\n \r\n
\r\n"); - - - #line 15 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - - - #line default - #line hidden - - #line 15 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - if (canConfig) - { - - - #line default - #line hidden - - #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - Write(Html.CheckBoxFor(model => model.LodgmentIncludeAllAttachmentsByDefault)); - - - #line default - #line hidden - - #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - - - - #line default - #line hidden -WriteLiteral(" Include All Attachments by Default\r\n"); - - - #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - - - #line default - #line hidden - - #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - Write(AjaxHelpers.AjaxSave()); - - - #line default - #line hidden - - #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - - - - #line default - #line hidden - - #line 20 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - Write(AjaxHelpers.AjaxLoader()); - - - #line default - #line hidden - - #line 20 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n If enabled, all attachments will be selected by default when lodging a job.\r" + -"\n

\r\n \r\n"); - -WriteLiteral(" \r\n $(function () {\r\n document.DiscoFun" + -"ctions.PropertyChangeHelper(\r\n $(\'#LodgmentIncludeAll" + -"AttachmentsByDefault\'),\r\n null,\r\n " + -" \'"); - - - #line 31 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - Write(Url.Action(MVC.API.JobPreferences.UpdateLodgmentIncludeAllAttachmentsByDefault())); - - - #line default - #line hidden -WriteLiteral("\',\r\n \'includeAllAttachmentsByDefault\');\r\n " + -" });\r\n \r\n"); - - - #line 35 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - -WriteLiteral(" "); - - - #line 39 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - Write(Model.LodgmentIncludeAllAttachmentsByDefault ? "Yes" : "No"); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n"); - - - #line 41 "..\..\Areas\Config\Views\JobPreferences\Parts\Lodgment.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
\r\n\r\n"); - - } - } -} -#pragma warning restore 1591 diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.cshtml b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.cshtml index 0bf033b4..56f77a04 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.cshtml +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.cshtml @@ -8,8 +8,9 @@

Report Preferences

-
- Noticeboard Default Theme: + + Noticeboard
+ Default Theme: 		@if (canConfig) diff --git a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.generated.cs b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.generated.cs index 18c3ab72..495448b3 100644 --- a/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.generated.cs +++ b/Disco.Web/Areas/Config/Views/JobPreferences/Parts/Reports.generated.cs @@ -63,19 +63,19 @@ WriteLiteral(" style=\"width: 530px;\""); WriteLiteral(">\r\n

Report Preferences

\r\n \r\n \r\n \r\n Noticeboard Default Theme:\r\n \r\n \r\n"); +WriteLiteral(">\r\n Noticeboard
\r\n Default Theme:\r\n " + +" \r\n
\r\n"); - #line 15 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 16 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" #line default #line hidden - #line 15 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 16 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" if (canConfig) { @@ -83,42 +83,42 @@ WriteLiteral(">\r\n Noticeboard Default Theme:\r\n model.DefaultNoticeboardTheme, Model.DefaultNoticeboardThemeOptions().Select(o => new SelectListItem() { Value = o.Key, Text = o.Value }))); #line default #line hidden - #line 17 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 18 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" #line default #line hidden - #line 18 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 18 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" #line default #line hidden - #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 20 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 19 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 20 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" @@ -138,7 +138,7 @@ WriteLiteral(@"> '"); - #line 27 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 28 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(Url.Action(MVC.API.JobPreferences.UpdateDefaultNoticeboardTheme())); @@ -155,7 +155,7 @@ WriteLiteral(@"', "); - #line 35 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 36 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" } else { @@ -164,14 +164,14 @@ WriteLiteral(@"', #line default #line hidden - #line 38 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 39 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(Model.DefaultNoticeboardThemeOptions().First(o => o.Key == Model.DefaultNoticeboardTheme).Value); #line default #line hidden - #line 38 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 39 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" } @@ -182,15 +182,15 @@ WriteLiteral(" (Model.DefaultNoticeboardTheme + #line 41 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" +, Tuple.Create(Tuple.Create("", 1791), Tuple.Create(Model.DefaultNoticeboardTheme #line default #line hidden -, 1768), false) +, 1791), false) ); WriteLiteral(">\r\n \r\n

Noticeboard Theme

\r\n"); WriteLiteral(" "); - #line 89 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 90 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(Html.DropDownList("Config_ReportPrefs_Builder_Theme", new SelectListItem[] { new SelectListItem() { Value = "", Text = "", Selected = true } }.Concat(Model.DefaultNoticeboardThemeOptions().Select(o => new SelectListItem() { Value = o.Key, Text = o.Value })))); @@ -495,13 +495,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 105 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 106 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" #line default #line hidden - #line 105 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 106 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" foreach (var deviceProfile in Model.DeviceProfiles.Value) { @@ -511,46 +511,46 @@ WriteLiteral(">\r\n"); WriteLiteral("
  • \r\n " + " (deviceProfile.Id + #line 109 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + , Tuple.Create(Tuple.Create("", 7348), Tuple.Create(deviceProfile.Id #line default #line hidden -, 7325), false) +, 7348), false) ); WriteLiteral(" type=\"checkbox\""); -WriteAttribute("value", Tuple.Create(" value=\"", 7361), Tuple.Create("\"", 7386) +WriteAttribute("value", Tuple.Create(" value=\"", 7384), Tuple.Create("\"", 7409) - #line 108 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" - , Tuple.Create(Tuple.Create("", 7369), Tuple.Create(deviceProfile.Id + #line 109 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + , Tuple.Create(Tuple.Create("", 7392), Tuple.Create(deviceProfile.Id #line default #line hidden -, 7369), false) +, 7392), false) ); WriteLiteral(" />(deviceProfile.Id + #line 109 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + , Tuple.Create(Tuple.Create("", 7455), Tuple.Create(deviceProfile.Id #line default #line hidden -, 7432), false) +, 7455), false) ); WriteLiteral(">"); - #line 108 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 109 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(deviceProfile.Description); @@ -559,7 +559,7 @@ WriteLiteral(">"); WriteLiteral("\r\n
    • \r\n"); - #line 110 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 111 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" } @@ -577,13 +577,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 115 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 116 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" #line default #line hidden - #line 115 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 116 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" foreach (var address in Model.OrganisationAddresses.Value) { @@ -593,46 +593,46 @@ WriteLiteral(">\r\n"); WriteLiteral("
  • \r\n " + " (address.Id + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + , Tuple.Create(Tuple.Create("", 8109), Tuple.Create(address.Id #line default #line hidden -, 8086), false) +, 8109), false) ); WriteLiteral(" type=\"checkbox\""); -WriteAttribute("value", Tuple.Create(" value=\"", 8116), Tuple.Create("\"", 8142) +WriteAttribute("value", Tuple.Create(" value=\"", 8139), Tuple.Create("\"", 8165) - #line 118 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" - , Tuple.Create(Tuple.Create("", 8124), Tuple.Create(address.ShortName + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + , Tuple.Create(Tuple.Create("", 8147), Tuple.Create(address.ShortName #line default #line hidden -, 8124), false) +, 8147), false) ); WriteLiteral(" />(address.Id + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + , Tuple.Create(Tuple.Create("", 8211), Tuple.Create(address.Id #line default #line hidden -, 8188), false) +, 8211), false) ); WriteLiteral(">"); - #line 118 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(address.Name); @@ -641,7 +641,7 @@ WriteLiteral(">"); WriteLiteral(" ("); - #line 118 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 119 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" Write(address.ShortName); @@ -650,7 +650,7 @@ WriteLiteral(" ("); WriteLiteral(")\r\n
    • \r\n"); - #line 120 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" + #line 121 "..\..\Areas\Config\Views\JobPreferences\Parts\Reports.cshtml" } diff --git a/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.js b/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.js index 80fbf41a..238bd180 100644 --- a/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.js +++ b/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.js @@ -15,7 +15,7 @@ document.DiscoFunctions = {}; } document.DiscoFunctions.CreateOpenJobDialog = function (url) { - createJobDialog = $('
    ').attr('id', 'createJobDialog').css({ paddingTop: '0' }).appendTo(document.body); + createJobDialog = $('
    ').attr('id', 'createJobDialog').css({ padding: '0', overflow: 'hidden', backgroundColor: '#fff' }).appendTo(document.body); createJobDialog.dialog({ resizable: false, diff --git a/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js b/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js index 39b3172e..8b45981e 100644 --- a/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js +++ b/Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js @@ -1 +1 @@ -(function(n,t,i){n(function(){var r=null,u={close:function(){r.dialog("close")},setButtons:function(n){r&&r.dialog("option","buttons",n)}};i.DiscoFunctions||(i.DiscoFunctions={});i.DiscoFunctions.CreateOpenJobDialog=function(f){r=n("
    ").attr("id","createJobDialog").css({paddingTop:"0"}).appendTo(i.body);r.dialog({resizable:!1,draggable:!1,modal:!0,autoOpen:!1,title:"Create Job",width:850,height:Math.min(670,n(t).height()-50),close:function(){r.find("iframe").attr("src","about:blank");r.dialog("destroy").remove();r=null},buttons:{}});var e=n("