From 4c91d03385fbc3589ba8732f533b1546ce35cb12 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Thu, 10 Nov 2016 17:42:10 +1100 Subject: [PATCH] Hide Document Templates & UI Tweaks Flag Document Templates as hidden. UI changes aim to improve visibility of used features in lists. --- Disco.Data/Disco.Data.csproj | 7 + .../201611100557315_DBv19.Designer.cs | 27 ++ .../Migrations/201611100557315_DBv19.cs | 18 + .../Migrations/201611100557315_DBv19.resx | 123 +++++ .../Repository/Device/DeviceUserAssignment.cs | 3 - .../DocumentTemplate/DocumentTemplate.cs | 2 + .../ConfigDeviceBatchIndexModelItem.cs | 1 + .../ConfigDeviceProfileIndexModelItem.cs | 9 +- .../ConfigDocumentTemplateIndexModel.cs | 8 +- .../UserFlag/ConfigUserFlagIndexModel.cs | 2 +- Disco.Services/Devices/DeviceExtensions.cs | 2 +- Disco.Services/Jobs/JobExtensions.cs | 2 +- Disco.Services/Users/UserExtensions.cs | 2 +- .../Controllers/DocumentTemplateController.cs | 26 ++ .../Controllers/DocumentTemplateController.cs | 13 +- .../Config/Controllers/UserFlagController.cs | 10 +- .../Config/Models/DeviceBatch/IndexModel.cs | 3 +- .../Models/DeviceBatch/_IndexModelItem.cs | 1 + .../Config/Models/DeviceProfile/IndexModel.cs | 3 +- .../Models/DeviceProfile/_IndexModelItem.cs | 9 +- .../Models/DocumentTemplate/IndexModel.cs | 5 +- .../Config/Models/UserFlag/IndexModel.cs | 2 +- .../Config/Views/DeviceBatch/Index.cshtml | 55 ++- .../Views/DeviceBatch/Index.generated.cs | 211 ++++++--- .../Views/DeviceProfile/_TableRender.cshtml | 23 +- .../DeviceProfile/_TableRender.generated.cs | 142 +++++- .../Views/DocumentTemplate/Index.cshtml | 69 ++- .../Views/DocumentTemplate/Index.generated.cs | 265 +++++++++-- .../Config/Views/DocumentTemplate/Show.cshtml | 53 ++- .../Views/DocumentTemplate/Show.generated.cs | 422 ++++++++++++------ .../Areas/Config/Views/UserFlag/Index.cshtml | 46 +- .../Config/Views/UserFlag/Index.generated.cs | 252 +++++++---- Disco.Web/ClientSource/Style/BundleSite.css | 44 +- .../ClientSource/Style/BundleSite.min.css | 4 +- Disco.Web/ClientSource/Style/Config.css | 41 +- Disco.Web/ClientSource/Style/Config.less | 26 -- Disco.Web/ClientSource/Style/Config.min.css | 2 +- .../ClientSource/Style/Declarations.less | 2 +- Disco.Web/ClientSource/Style/Device.css | 20 +- Disco.Web/ClientSource/Style/Device.min.css | 2 +- Disco.Web/ClientSource/Style/Dialog.css | 7 +- Disco.Web/ClientSource/Style/Dialog.min.css | 2 +- Disco.Web/ClientSource/Style/Job.css | 7 +- Disco.Web/ClientSource/Style/Job.min.css | 2 +- Disco.Web/ClientSource/Style/Shared.css | 7 +- Disco.Web/ClientSource/Style/Shared.less | 9 +- Disco.Web/ClientSource/Style/Shared.min.css | 2 +- Disco.Web/ClientSource/Style/Site.css | 44 +- Disco.Web/ClientSource/Style/Site.less | 9 + Disco.Web/ClientSource/Style/Site.min.css | 2 +- Disco.Web/ClientSource/Style/User.css | 7 +- Disco.Web/ClientSource/Style/User.min.css | 2 +- .../ClientSource/Style/jQueryUIExtensions.css | 7 +- .../Style/jQueryUIExtensions.min.css | 2 +- ...PI.DocumentTemplateController.generated.cs | 32 ++ 55 files changed, 1485 insertions(+), 613 deletions(-) create mode 100644 Disco.Data/Migrations/201611100557315_DBv19.Designer.cs create mode 100644 Disco.Data/Migrations/201611100557315_DBv19.cs create mode 100644 Disco.Data/Migrations/201611100557315_DBv19.resx diff --git a/Disco.Data/Disco.Data.csproj b/Disco.Data/Disco.Data.csproj index 3418a446..f1445a74 100644 --- a/Disco.Data/Disco.Data.csproj +++ b/Disco.Data/Disco.Data.csproj @@ -158,6 +158,10 @@ 201611090729100_DBv18.cs + + + 201611100557315_DBv19.cs + @@ -227,6 +231,9 @@ 201611090729100_DBv18.cs + + 201611100557315_DBv19.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/Disco.Data/Migrations/201611100557315_DBv19.Designer.cs b/Disco.Data/Migrations/201611100557315_DBv19.Designer.cs new file mode 100644 index 00000000..7947ea3d --- /dev/null +++ b/Disco.Data/Migrations/201611100557315_DBv19.Designer.cs @@ -0,0 +1,27 @@ +// +namespace Disco.Data.Migrations +{ + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + public sealed partial class DBv19 : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(DBv19)); + + string IMigrationMetadata.Id + { + get { return "201611100557315_DBv19"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/Disco.Data/Migrations/201611100557315_DBv19.cs b/Disco.Data/Migrations/201611100557315_DBv19.cs new file mode 100644 index 00000000..8a8e7d88 --- /dev/null +++ b/Disco.Data/Migrations/201611100557315_DBv19.cs @@ -0,0 +1,18 @@ +namespace Disco.Data.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class DBv19 : DbMigration + { + public override void Up() + { + AddColumn("dbo.DocumentTemplates", "IsHidden", c => c.Boolean(nullable: false)); + } + + public override void Down() + { + DropColumn("dbo.DocumentTemplates", "IsHidden"); + } + } +} diff --git a/Disco.Data/Migrations/201611100557315_DBv19.resx b/Disco.Data/Migrations/201611100557315_DBv19.resx new file mode 100644 index 00000000..9e95bf49 --- /dev/null +++ b/Disco.Data/Migrations/201611100557315_DBv19.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + \ No newline at end of file diff --git a/Disco.Models/Repository/Device/DeviceUserAssignment.cs b/Disco.Models/Repository/Device/DeviceUserAssignment.cs index ee19e0bd..83880d06 100644 --- a/Disco.Models/Repository/Device/DeviceUserAssignment.cs +++ b/Disco.Models/Repository/Device/DeviceUserAssignment.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/Disco.Models/Repository/DocumentTemplate/DocumentTemplate.cs b/Disco.Models/Repository/DocumentTemplate/DocumentTemplate.cs index 25823361..cdc2cdf6 100644 --- a/Disco.Models/Repository/DocumentTemplate/DocumentTemplate.cs +++ b/Disco.Models/Repository/DocumentTemplate/DocumentTemplate.cs @@ -32,6 +32,8 @@ namespace Disco.Models.Repository public string DevicesLinkedGroup { get; set; } public string UsersLinkedGroup { get; set; } + public bool IsHidden { get; set; } + [InverseProperty("DocumentTemplates")] public virtual IList JobSubTypes { get; set; } diff --git a/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchIndexModelItem.cs b/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchIndexModelItem.cs index b8abcfcf..fa976a7f 100644 --- a/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchIndexModelItem.cs +++ b/Disco.Models/UI/Config/DeviceBatch/ConfigDeviceBatchIndexModelItem.cs @@ -20,5 +20,6 @@ namespace Disco.Models.UI.Config.DeviceBatch DateTime? WarrantyExpires { get; set; } DateTime? InsuredUntil { get; set; } string InsuranceSupplier { get; set; } + bool IsLinked { get; set; } } } diff --git a/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileIndexModelItem.cs b/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileIndexModelItem.cs index eac3c90c..fce65f5e 100644 --- a/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileIndexModelItem.cs +++ b/Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileIndexModelItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Disco.Models.UI.Config.DeviceProfile +namespace Disco.Models.UI.Config.DeviceProfile { public interface ConfigDeviceProfileIndexModelItem { @@ -18,5 +12,6 @@ namespace Disco.Models.UI.Config.DeviceProfile int DeviceCount { get; set; } int DeviceDecommissionedCount { get; set; } + bool IsLinked { get; set; } } } diff --git a/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateIndexModel.cs b/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateIndexModel.cs index 734f2a97..25502fe6 100644 --- a/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateIndexModel.cs +++ b/Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateIndexModel.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace Disco.Models.UI.Config.DocumentTemplate { public interface ConfigDocumentTemplateIndexModel : BaseUIModel { - List DocumentTemplates { get; set; } + Dictionary DocumentTemplates { get; set; } } } diff --git a/Disco.Models/UI/Config/UserFlag/ConfigUserFlagIndexModel.cs b/Disco.Models/UI/Config/UserFlag/ConfigUserFlagIndexModel.cs index 549e9a6e..9568a3c1 100644 --- a/Disco.Models/UI/Config/UserFlag/ConfigUserFlagIndexModel.cs +++ b/Disco.Models/UI/Config/UserFlag/ConfigUserFlagIndexModel.cs @@ -4,6 +4,6 @@ namespace Disco.Models.UI.Config.UserFlag { public interface ConfigUserFlagIndexModel : BaseUIModel { - List UserFlags { get; set; } + Dictionary UserFlags { get; set; } } } \ No newline at end of file diff --git a/Disco.Services/Devices/DeviceExtensions.cs b/Disco.Services/Devices/DeviceExtensions.cs index 817313c0..69ef9714 100644 --- a/Disco.Services/Devices/DeviceExtensions.cs +++ b/Disco.Services/Devices/DeviceExtensions.cs @@ -50,7 +50,7 @@ namespace Disco.Services public static List AvailableDocumentTemplates(this Device d, DiscoDataContext Database, User User, DateTime TimeStamp) { List ats = Database.DocumentTemplates - .Where(at => at.Scope == DocumentTemplate.DocumentTemplateScopes.Device).ToList(); + .Where(at => !at.IsHidden && at.Scope == DocumentTemplate.DocumentTemplateScopes.Device).ToList(); return ats.Where(at => at.FilterExpressionMatches(d, Database, User, TimeStamp, DocumentState.DefaultState())).ToList(); } diff --git a/Disco.Services/Jobs/JobExtensions.cs b/Disco.Services/Jobs/JobExtensions.cs index 3f6a5916..350aec7c 100644 --- a/Disco.Services/Jobs/JobExtensions.cs +++ b/Disco.Services/Jobs/JobExtensions.cs @@ -204,7 +204,7 @@ namespace Disco.Services public static List AvailableDocumentTemplates(this Job j, DiscoDataContext Database, User User, DateTime TimeStamp) { var dts = Database.DocumentTemplates.Include("JobSubTypes") - .Where(dt => dt.Scope == DocumentTemplate.DocumentTemplateScopes.Job) + .Where(dt => !dt.IsHidden && dt.Scope == DocumentTemplate.DocumentTemplateScopes.Job) .ToList(); foreach (var dt in dts.ToArray()) diff --git a/Disco.Services/Users/UserExtensions.cs b/Disco.Services/Users/UserExtensions.cs index 72edb2ba..8e482cf2 100644 --- a/Disco.Services/Users/UserExtensions.cs +++ b/Disco.Services/Users/UserExtensions.cs @@ -28,7 +28,7 @@ namespace Disco.Services public static List AvailableDocumentTemplates(this User u, DiscoDataContext Database, User User, DateTime TimeStamp) { var dts = Database.DocumentTemplates.Include("JobSubTypes") - .Where(dt => dt.Scope == DocumentTemplate.DocumentTemplateScopes.User) + .Where(dt => !dt.IsHidden && dt.Scope == DocumentTemplate.DocumentTemplateScopes.User) .ToArray() .Where(dt => dt.FilterExpressionMatches(u, Database, User, TimeStamp, DocumentState.DefaultState())).ToList(); diff --git a/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs b/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs index 48bf3ec9..8d032909 100644 --- a/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs +++ b/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs @@ -26,6 +26,7 @@ namespace Disco.Web.Areas.API.Controllers const string pOnGenerateExpression = "ongenerateexpression"; const string pOnImportAttachmentExpression = "onimportattachmentexpression"; const string pFlattenForm = "flattenform"; + const string pIsHidden = "ishidden"; [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)] public virtual ActionResult Update(string id, string key, string value = null, bool redirect = false) @@ -63,6 +64,9 @@ namespace Disco.Web.Areas.API.Controllers case pFlattenForm: UpdateFlattenForm(documentTemplate, value); break; + case pIsHidden: + UpdateIsHidden(documentTemplate, value); + break; default: throw new Exception("Invalid Update Key"); } @@ -190,6 +194,11 @@ namespace Disco.Web.Areas.API.Controllers return Update(id, pFlattenForm, FlattenForm, redirect); } [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)] + public virtual ActionResult UpdateIsHidden(string id, string IsHidden = null, bool redirect = false) + { + return Update(id, pIsHidden, IsHidden, redirect); + } + [DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)] public virtual ActionResult UpdateScope(string id, string Scope = null, bool redirect = false) { return Update(id, pScope, Scope, redirect); @@ -393,6 +402,23 @@ namespace Disco.Web.Areas.API.Controllers Database.SaveChanges(); } + private void UpdateIsHidden(DocumentTemplate documentTemplate, string IsHidden) + { + if (string.IsNullOrWhiteSpace(IsHidden)) + { + documentTemplate.IsHidden = false; + } + else + { + bool value = default(bool); + if (bool.TryParse(IsHidden, out value)) + documentTemplate.IsHidden = value; + else + throw new Exception("Invalid Boolean Format"); + } + + Database.SaveChanges(); + } private void UpdateJobSubTypes(DocumentTemplate documentTemplate, List JobSubTypes) { Database.Configuration.LazyLoadingEnabled = true; diff --git a/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs b/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs index ec9b61fc..539267d7 100644 --- a/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs +++ b/Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs @@ -20,7 +20,18 @@ namespace Disco.Web.Areas.Config.Controllers { if (string.IsNullOrEmpty(id)) { - var m = new Models.DocumentTemplate.IndexModel() { DocumentTemplates = Database.DocumentTemplates.ToList() }; + var m = new Models.DocumentTemplate.IndexModel() { + DocumentTemplates = Database.DocumentTemplates + .Select(dt => new + { + documentTemplate = dt, + storedInstances = + Database.DeviceAttachments.Count(a => a.DocumentTemplateId == dt.Id) + + Database.JobAttachments.Count(a => a.DocumentTemplateId == dt.Id) + + Database.UserAttachments.Count(a => a.DocumentTemplateId == dt.Id) + }) + .ToDictionary(i => i.documentTemplate, i => i.storedInstances) + }; // UI Extensions UIExtensions.ExecuteExtensions(this.ControllerContext, m); diff --git a/Disco.Web/Areas/Config/Controllers/UserFlagController.cs b/Disco.Web/Areas/Config/Controllers/UserFlagController.cs index 9101299c..944d4d58 100644 --- a/Disco.Web/Areas/Config/Controllers/UserFlagController.cs +++ b/Disco.Web/Areas/Config/Controllers/UserFlagController.cs @@ -53,7 +53,15 @@ namespace Disco.Web.Areas.Config.Controllers // List Index var m = new Models.UserFlag.IndexModel() { - UserFlags = Database.UserFlags.OrderBy(f => f.Name).ToList() + UserFlags = Database.UserFlags + .Select(uf => new + { + userFlag = uf, + assignmentCount = uf.UserFlagAssignments.Count(fa => !fa.RemovedDate.HasValue) + }) + .ToDictionary( + pair => pair.userFlag, + pair => pair.assignmentCount) }; // UI Extensions diff --git a/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs b/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs index 5f3af37f..05c13b38 100644 --- a/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs +++ b/Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs @@ -25,7 +25,8 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch DefaultDeviceModel = db.DefaultDeviceModel.Description, WarrantyExpires = db.WarrantyValidUntil, InsuranceSupplier = db.InsuranceSupplier, - InsuredUntil = db.InsuredUntil + InsuredUntil = db.InsuredUntil, + IsLinked = db.AssignedUsersLinkedGroup != null || db.DevicesLinkedGroup != null }).ToArray().Cast().ToList(); foreach (var item in m.DeviceBatches.Where(db => db.DefaultDeviceModel == null)) diff --git a/Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelItem.cs b/Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelItem.cs index 5ff2fc67..cb29a0f3 100644 --- a/Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelItem.cs +++ b/Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelItem.cs @@ -20,5 +20,6 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch public DateTime? WarrantyExpires { get; set; } public DateTime? InsuredUntil { get; set; } public string InsuranceSupplier { get; set; } + public bool IsLinked { get; set; } } } \ No newline at end of file diff --git a/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs b/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs index 36fe1e3e..9d8c3577 100644 --- a/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs +++ b/Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs @@ -21,7 +21,8 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile Description = dp.Description, DistributionType = dp.DistributionType.Value, DeviceCount = dp.Devices.Count, - DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue) + DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue), + IsLinked = dp.AssignedUsersLinkedGroup != null || dp.DevicesLinkedGroup != null }).ToArray().Cast().ToList(); if (DiscoApplication.MultiSiteMode) diff --git a/Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelItem.cs b/Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelItem.cs index 609cdbf6..644d9e2e 100644 --- a/Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelItem.cs +++ b/Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.ComponentModel.DataAnnotations; -using Disco.Web.Extensions; -using Disco.Models.UI.Config.DeviceProfile; +using Disco.Models.UI.Config.DeviceProfile; namespace Disco.Web.Areas.Config.Models.DeviceProfile { @@ -20,5 +14,6 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile public int DeviceCount { get; set; } public int DeviceDecommissionedCount { get; set; } + public bool IsLinked { get; set; } } } \ No newline at end of file diff --git a/Disco.Web/Areas/Config/Models/DocumentTemplate/IndexModel.cs b/Disco.Web/Areas/Config/Models/DocumentTemplate/IndexModel.cs index 1a0875d8..36e77310 100644 --- a/Disco.Web/Areas/Config/Models/DocumentTemplate/IndexModel.cs +++ b/Disco.Web/Areas/Config/Models/DocumentTemplate/IndexModel.cs @@ -1,13 +1,10 @@ using Disco.Models.UI.Config.DocumentTemplate; -using System; using System.Collections.Generic; -using System.Linq; -using System.Web; namespace Disco.Web.Areas.Config.Models.DocumentTemplate { public class IndexModel : ConfigDocumentTemplateIndexModel { - public List DocumentTemplates { get; set; } + public Dictionary DocumentTemplates { get; set; } } } \ No newline at end of file diff --git a/Disco.Web/Areas/Config/Models/UserFlag/IndexModel.cs b/Disco.Web/Areas/Config/Models/UserFlag/IndexModel.cs index 51c5ead5..bd4d9047 100644 --- a/Disco.Web/Areas/Config/Models/UserFlag/IndexModel.cs +++ b/Disco.Web/Areas/Config/Models/UserFlag/IndexModel.cs @@ -5,6 +5,6 @@ namespace Disco.Web.Areas.Config.Models.UserFlag { public class IndexModel : ConfigUserFlagIndexModel { - public List UserFlags { get; set; } + public Dictionary UserFlags { get; set; } } } \ No newline at end of file diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml index 093a6ab2..09f21321 100644 --- a/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml +++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml @@ -2,17 +2,19 @@ @{ Authorization.Require(Claims.Config.DeviceBatch.Show); ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches"); + var hasDecommissionedBatches = Model.DeviceBatches.Any(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount); + var showTags = hasDecommissionedBatches || Model.DeviceBatches.Any(i => i.IsLinked); }
@if (Model.DeviceBatches.Count == 0) {

No device batches are configured

-
+
} else { - if (Model.DeviceBatches.Any(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount)) + if (hasDecommissionedBatches) { Show Decommissioned (@(Model.DeviceBatches.Count(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount))) + } + - - - + + + + + @if (showTags) + { + + } - @foreach (var item in Model.DocumentTemplates) + @foreach (var pair in Model.DocumentTemplates) { - - - - + var item = pair.Key; + var storedCount = pair.Value; + + + + + + @if (showTags) + { + + } }
Id - Description - Scope - IdDescriptionScopeStored Instances 
- @Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id)) - - @Html.DisplayFor(modelItem => item.Description) - - @Html.DisplayFor(modelItem => item.Scope) -
@Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id))@Html.DisplayFor(modelItem => item.Description)@Html.DisplayFor(modelItem => item.Scope)@storedCount.ToString("N0") + @if (item.DevicesLinkedGroup != null || item.UsersLinkedGroup != null) + { + + } + @if (item.FilterExpression != null || item.OnGenerateExpression != null || item.OnImportAttachmentExpression != null) + { + + } + @if (item.IsHidden) + { + + } +
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs index c9f438d1..13793836 100644 --- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs +++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate using System.Web.UI; using System.Web.WebPages; using Disco; - using Disco.BI.Extensions; using Disco.Models.Repository; using Disco.Services; using Disco.Services.Authorization; @@ -50,6 +49,8 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate Authorization.Require(Claims.Config.DocumentTemplate.Show); ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates"); + var showTags = Model.DocumentTemplates.Keys.Any(i => i.DevicesLinkedGroup != null || i.UsersLinkedGroup != null || + i.FilterExpression != null || i.OnGenerateExpression != null || i.OnImportAttachmentExpression != null); #line default @@ -57,7 +58,7 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate WriteLiteral("\r\n"); - #line 7 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 9 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" if (Model.DocumentTemplates.Count == 0) { @@ -70,76 +71,264 @@ WriteLiteral(" class=\"form\""); WriteLiteral(" style=\"width: 450px; padding: 100px 0;\""); -WriteLiteral(">\r\n

No document templates are configured

\r\n \r\n"); +WriteLiteral(">\r\n

No document templates are configured

\r\n \r\n"); - #line 12 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 14 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } else { + if (Model.DocumentTemplates.Keys.Any(dt => dt.IsHidden)) + { + + + #line default + #line hidden +WriteLiteral(" Show Hidden ("); + + + #line 19 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + Write(Model.DocumentTemplates.Keys.Count(dt => dt.IsHidden)); + + + #line default + #line hidden +WriteLiteral(")\r\n"); + +WriteLiteral(@" +"); + + + #line 29 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + } #line default #line hidden WriteLiteral(" \r\n \r\n Id\r\n \r\n Descripti" + -"on\r\n \r\n Scope\r\n \r\n \r\n" + -""); +WriteLiteral(">\r\n \r\n Id\r\n Description\r\n " + +" Scope\r\n Stored Instances\r\n"); - #line 24 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 36 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + + + #line default + #line hidden + + #line 36 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + if (showTags) + { + + + #line default + #line hidden +WriteLiteral("  \r\n"); + + + #line 39 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" #line default #line hidden - #line 24 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" - foreach (var item in Model.DocumentTemplates) + #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + foreach (var pair in Model.DocumentTemplates) { + var item = pair.Key; + var storedCount = pair.Value; #line default #line hidden -WriteLiteral(" \r\n \r\n"); +WriteLiteral(" (item.IsHidden ? "hidden" : null + + #line default + #line hidden +, 1806), false) +); + +WriteLiteral(">\r\n "); - #line 28 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 46 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id))); #line default #line hidden -WriteLiteral("\r\n \r\n \r\n"); - -WriteLiteral(" "); +WriteLiteral("\r\n "); - #line 31 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.DisplayFor(modelItem => item.Description)); #line default #line hidden -WriteLiteral("\r\n \r\n \r\n"); - -WriteLiteral(" "); +WriteLiteral("\r\n "); - #line 34 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 48 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.DisplayFor(modelItem => item.Scope)); #line default #line hidden -WriteLiteral("\r\n \r\n \r\n"); +WriteLiteral("\r\n "); - #line 37 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + Write(storedCount.ToString("N0")); + + + #line default + #line hidden +WriteLiteral("\r\n"); + + + #line 50 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + + + #line default + #line hidden + + #line 50 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + if (showTags) + { + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + + + #line default + #line hidden + + #line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + if (item.DevicesLinkedGroup != null || item.UsersLinkedGroup != null) + { + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 56 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" "); + + + #line 57 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + if (item.FilterExpression != null || item.OnGenerateExpression != null || item.OnImportAttachmentExpression != null) + { + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 60 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" "); + + + #line 61 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + if (item.IsHidden) + { + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 64 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 66 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 68 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } @@ -148,7 +337,7 @@ WriteLiteral("\r\n \r\n \r\n"); WriteLiteral(" \r\n"); - #line 39 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 70 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } @@ -161,13 +350,13 @@ WriteLiteral(" class=\"actionBar\""); WriteLiteral(">\r\n"); - #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 72 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" #line default #line hidden - #line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 72 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" if (Authorization.Has(Claims.Config.DocumentTemplate.UndetectedPages)) { @@ -175,14 +364,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 43 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 74 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.ActionLinkButton("Undetected Pages", MVC.Config.DocumentTemplate.UndetectedPages())); #line default #line hidden - #line 43 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 74 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } @@ -192,7 +381,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 45 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 76 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" if (Authorization.Has(Claims.Config.DocumentTemplate.ShowStatus)) { @@ -200,14 +389,14 @@ WriteLiteral(" "); #line default #line hidden - #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 78 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.ActionLinkButton("Import Status", MVC.Config.DocumentTemplate.ImportStatus())); #line default #line hidden - #line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 78 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } @@ -217,7 +406,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 49 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 80 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" if (Authorization.Has(Claims.Config.Show)) { @@ -225,14 +414,14 @@ WriteLiteral(" "); #line default #line hidden - #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 82 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser())); #line default #line hidden - #line 51 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 82 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } @@ -242,7 +431,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 84 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" if (Authorization.HasAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure)) { @@ -250,14 +439,14 @@ WriteLiteral(" "); #line default #line hidden - #line 55 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 86 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" Write(Html.ActionLinkButton("Create Document Template", MVC.Config.DocumentTemplate.Create())); #line default #line hidden - #line 55 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" + #line 86 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml" } diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml index e59ef3d8..9d320807 100644 --- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml +++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml @@ -105,29 +105,29 @@
@if (canConfig) { - - + + @AjaxHelpers.AjaxLoader() } else { - - + + }

- If selected when a document is generated all form elements will be removed and their content written in place. + If selected the template will not appear in the list of documents to generate.

@@ -331,6 +331,41 @@ } + + +   + + +
+ @if (canConfig) + { + + + @AjaxHelpers.AjaxLoader() + + } + else + { + + + } +
+
+

+ When a document is generated all form elements will be removed and their content written in place if this option is selected. +

+
+ + @@ -478,7 +513,7 @@ }

- This expression will be evaluated to determine if this template is shown in the Generate Document drop-down list. + This expression will be evaluated to determine if this template is shown in the Generate Document drop-down list. If the template is hidden (see above) this expression is ignored.

diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs index 02e10c23..b1d8bad9 100644 --- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs +++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs @@ -303,7 +303,7 @@ WriteLiteral(" \r\n \r\n #line hidden WriteLiteral(" \r\n"); WriteLiteral(" Flatten Form\r\n"); +WriteLiteral(">Hidden\r\n"); #line 110 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" @@ -351,20 +351,20 @@ WriteLiteral(" type=\"text/javascript\""); WriteLiteral(@"> $(function () { document.DiscoFunctions.PropertyChangeHelper( - $('#DocumentTemplate_FlattenForm'), + $('#DocumentTemplate_IsHidden'), null, '"); #line 116 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" - Write(Url.Action(MVC.API.DocumentTemplate.UpdateFlattenForm(Model.DocumentTemplate.Id))); + Write(Url.Action(MVC.API.DocumentTemplate.UpdateIsHidden(Model.DocumentTemplate.Id))); #line default #line hidden -WriteLiteral("\',\r\n \'FlattenForm\'\r\n " + -" );\r\n });\r\n " + -" \r\n"); +WriteLiteral("\',\r\n \'IsHidden\'\r\n " + +" );\r\n });\r\n " + +"\r\n"); #line 121 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" @@ -377,7 +377,7 @@ WriteLiteral("\',\r\n \'FlattenForm\'\r\n #line hidden WriteLiteral(" \r\n"); WriteLiteral(" Flatten Form\r\n"); +WriteLiteral(">Hidden\r\n"); #line 126 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" @@ -417,7 +417,7 @@ WriteLiteral(">\r\n If selected when a document is generated all form elements will be removed and their content written in place. +WriteLiteral(@">If selected the template will not appear in the list of documents to generate.

@@ -459,23 +459,23 @@ WriteLiteral(">This template is generated from "); #line hidden WriteLiteral("s. Any expressions within the Template PDF will be evaluated within the (Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()) + , Tuple.Create(Tuple.Create("", 6747), Tuple.Create(Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser()) #line default #line hidden -, 6872), false) -, Tuple.Create(Tuple.Create("", 6934), Tuple.Create("#", 6934), true) +, 6747), false) +, Tuple.Create(Tuple.Create("", 6809), Tuple.Create("#", 6809), true) #line 143 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" - , Tuple.Create(Tuple.Create("", 6935), Tuple.Create(Model.DocumentTemplate.Scope + , Tuple.Create(Tuple.Create("", 6810), Tuple.Create(Model.DocumentTemplate.Scope #line default #line hidden -, 6935), false) -, Tuple.Create(Tuple.Create("", 6966), Tuple.Create("Scope", 6966), true) +, 6810), false) +, Tuple.Create(Tuple.Create("", 6841), Tuple.Create("Scope", 6841), true) ); WriteLiteral(">"); @@ -566,24 +566,24 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (scope +, Tuple.Create(Tuple.Create("", 7914), Tuple.Create(scope #line default #line hidden -, 8039), false) +, 7914), false) ); -WriteAttribute("selected", Tuple.Create(" selected=\"", 8046), Tuple.Create("\"", 8118) +WriteAttribute("selected", Tuple.Create(" selected=\"", 7921), Tuple.Create("\"", 7993) #line 159 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" -, Tuple.Create(Tuple.Create("", 8057), Tuple.Create(scope == Model.DocumentTemplate.Scope ? " selected" : null +, Tuple.Create(Tuple.Create("", 7932), Tuple.Create(scope == Model.DocumentTemplate.Scope ? " selected" : null #line default #line hidden -, 8057), false) +, 7932), false) ); WriteLiteral(">"); @@ -919,29 +919,29 @@ WriteLiteral(" class=\"jobTypes\""); WriteLiteral(">\r\n

\r\n " + " (jt.Id +, Tuple.Create(Tuple.Create("", 14012), Tuple.Create(jt.Id #line default #line hidden -, 14137), false) +, 14012), false) ); WriteLiteral(" class=\"jobType\""); WriteLiteral(" type=\"checkbox\""); -WriteAttribute("value", Tuple.Create(" value=\"", 14178), Tuple.Create("\"", 14194) +WriteAttribute("value", Tuple.Create(" value=\"", 14053), Tuple.Create("\"", 14069) #line 257 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" - , Tuple.Create(Tuple.Create("", 14186), Tuple.Create(jt.Id + , Tuple.Create(Tuple.Create("", 14061), Tuple.Create(jt.Id #line default #line hidden -, 14186), false) +, 14061), false) ); WriteLiteral(" "); @@ -955,15 +955,15 @@ WriteLiteral(" "); #line hidden WriteLiteral(" />(jt.Id + , Tuple.Create(Tuple.Create("", 14153), Tuple.Create(jt.Id #line default #line hidden -, 14278), false) +, 14153), false) ); WriteLiteral(">"); @@ -978,15 +978,15 @@ WriteLiteral(">"); WriteLiteral("\r\n

\r\n " + " (jt.Id +, Tuple.Create(Tuple.Create("", 14285), Tuple.Create(jt.Id #line default #line hidden -, 14410), false) +, 14285), false) ); WriteLiteral(" class=\"jobSubTypes\""); @@ -1085,8 +1085,150 @@ WriteLiteral(" \r\n"); #line default #line hidden -WriteLiteral(" \r\n \r\n \r\n <" + -"/table>\r\n \r\n\r\n \r\n \r\n \r\n " + +" \r\n  \r\n \r\n " + +" \r\n
\r\n"); + + + #line 340 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + + + #line default + #line hidden + + #line 340 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + if (canConfig) + { + + + #line default + #line hidden +WriteLiteral("
\r\n \r\n \r\n When a document is generated all form elements will be removed and their content written in place if this option is selected. +

+ + + + + + + + \r\n (Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id)) + #line 380 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" +, Tuple.Create(Tuple.Create("", 20854), Tuple.Create(Url.Action(MVC.API.DocumentTemplate.TemplatePreview(Model.DocumentTemplate.Id)) #line default #line hidden -, 18866), false) +, 20854), false) ); WriteLiteral(" />\r\n \r\n \r\n <" + "/tr>\r\n"); - #line 349 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 384 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 349 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 384 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (canConfig) { @@ -1138,7 +1280,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 353 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 388 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.ActionLinkSmallButton("Download Template", MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id))); @@ -1147,13 +1289,13 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 354 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 389 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 354 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 389 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.Upload)) { @@ -1180,13 +1322,13 @@ WriteLiteral(">\r\n

Select a PDF Template to uplo "
\r\n"); - #line 360 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 395 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 360 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 395 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" using (Html.BeginForm(MVC.API.DocumentTemplate.Template(Model.DocumentTemplate.Id, true, null), FormMethod.Post, new { enctype = "multipart/form-data" })) { @@ -1206,7 +1348,7 @@ WriteLiteral(" style=\"width: 250px;\""); WriteLiteral(" />\r\n"); - #line 363 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 398 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } @@ -1247,7 +1389,7 @@ WriteLiteral(">\r\n $(function () {\r\n "script>\r\n"); - #line 404 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 439 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } @@ -1256,7 +1398,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n \r\n"); - #line 407 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 442 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } @@ -1273,13 +1415,13 @@ WriteLiteral(">\r\n

Advanced Options

\r\n \r\n "sion:\r\n \r\n
\r\n"); - #line 421 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 456 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 421 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 456 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.ConfigureFilterExpression)) { @@ -1287,56 +1429,56 @@ WriteLiteral(">\r\n

Advanced Options

\r\n \r\n #line default #line hidden - #line 423 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 458 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.EditorFor(model => model.DocumentTemplate.FilterExpression)); #line default #line hidden - #line 423 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 458 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 424 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 459 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxRemove()); #line default #line hidden - #line 424 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 459 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 425 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 460 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 425 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 460 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 426 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 461 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 426 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 461 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" @@ -1358,7 +1500,7 @@ WriteLiteral(@"> '"); - #line 436 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 471 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Url.Action(MVC.API.DocumentTemplate.UpdateFilterExpression(Model.DocumentTemplate.Id))); @@ -1386,7 +1528,7 @@ WriteLiteral("\',\r\n \'FilterExpression\'\r\ " \r\n"); - #line 465 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 500 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } else { @@ -1403,7 +1545,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Specified>\r\n"); - #line 471 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 506 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } else { @@ -1420,7 +1562,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 475 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 510 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Model.DocumentTemplate.FilterExpression); @@ -1429,7 +1571,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n"); - #line 477 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 512 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } } @@ -1448,7 +1590,7 @@ WriteLiteral(">\r\n This expression will be evaluated to determine if this template is shown in the Generate Document drop-down list. +WriteLiteral(@">This expression will be evaluated to determine if this template is shown in the Generate Document drop-down list. If the template is hidden (see above) this expression is ignored.

@@ -1461,13 +1603,13 @@ WriteLiteral(@">This expression will be evaluated to determine if this templ "); - #line 491 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 526 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 491 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 526 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.ConfigureFilterExpression)) { @@ -1475,56 +1617,56 @@ WriteLiteral(@">This expression will be evaluated to determine if this templ #line default #line hidden - #line 493 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 528 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.EditorFor(model => model.DocumentTemplate.OnGenerateExpression)); #line default #line hidden - #line 493 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 528 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 494 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 529 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxRemove()); #line default #line hidden - #line 494 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 529 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 495 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 530 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 495 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 530 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 496 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 531 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 496 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 531 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" @@ -1546,7 +1688,7 @@ WriteLiteral(@"> '"); - #line 506 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 541 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Url.Action(MVC.API.DocumentTemplate.UpdateOnGenerateExpression(Model.DocumentTemplate.Id))); @@ -1574,7 +1716,7 @@ WriteLiteral("\',\r\n \'OnGenerateExpression\ " \r\n"); - #line 535 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 570 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } else { @@ -1591,7 +1733,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Specified>\r\n"); - #line 541 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 576 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } else { @@ -1608,7 +1750,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 545 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 580 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Model.DocumentTemplate.OnGenerateExpression); @@ -1617,7 +1759,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n"); - #line 547 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 582 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } } @@ -1649,13 +1791,13 @@ WriteLiteral(@">This expression will be evaluated each time a document is ge "); - #line 561 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 596 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 561 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 596 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (canConfig && Authorization.Has(Claims.Config.DocumentTemplate.ConfigureFilterExpression)) { @@ -1663,56 +1805,56 @@ WriteLiteral(@">This expression will be evaluated each time a document is ge #line default #line hidden - #line 563 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 598 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.EditorFor(model => model.DocumentTemplate.OnImportAttachmentExpression)); #line default #line hidden - #line 563 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 598 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 564 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 599 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxRemove()); #line default #line hidden - #line 564 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 599 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 565 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 600 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 565 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 600 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 566 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 601 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 566 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 601 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" @@ -1734,7 +1876,7 @@ WriteLiteral(@"> '"); - #line 576 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 611 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Url.Action(MVC.API.DocumentTemplate.UpdateOnImportAttachmentExpression(Model.DocumentTemplate.Id))); @@ -1762,7 +1904,7 @@ WriteLiteral("\',\r\n \'OnImportAttachmentExp " \r\n"); - #line 605 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 640 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } else { @@ -1779,7 +1921,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None Specified>\r\n"); - #line 611 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 646 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } else { @@ -1796,7 +1938,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 615 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 650 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Model.DocumentTemplate.OnImportAttachmentExpression); @@ -1805,7 +1947,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n"); - #line 617 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 652 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } } @@ -1840,7 +1982,7 @@ WriteLiteral(@">This expression will be evaluated each time a document is im WriteLiteral(" "); - #line 632 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 667 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views.LinkedGroupInstance, new LinkedGroupModel() { CanConfigure = canConfig, @@ -1859,7 +2001,7 @@ WriteLiteral("\r\n"); WriteLiteral(" "); - #line 641 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 676 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views.LinkedGroupInstance, new LinkedGroupModel() { CanConfigure = canConfig, @@ -1876,13 +2018,13 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 650 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 685 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 650 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 685 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (canConfig) { @@ -1890,14 +2032,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 652 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 687 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.Partial(MVC.Config.Shared.Views.LinkedGroupShared)); #line default #line hidden - #line 652 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 687 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" } @@ -1914,7 +2056,7 @@ WriteLiteral(">\r\n

Template Expressions

\r\n"); WriteLiteral(" "); - #line 662 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 697 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" Write(Html.Partial(MVC.Config.DocumentTemplate.Views._ExpressionsTable, Model.TemplateExpressions)); @@ -1978,13 +2120,13 @@ WriteLiteral(" class=\"actionBar\""); WriteLiteral(">\r\n"); - #line 705 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 740 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line default #line hidden - #line 705 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" + #line 740 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" if (hideAdvanced) { @@ -2010,7 +2152,7 @@ WriteLiteral(@"