From 57a7f67c3a1fed2394191626fd17a27e97432950 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 8 Feb 2023 16:24:21 +1100 Subject: [PATCH] remove device custom details this plugin functionality has never been used --- .../Devices/Exporting/DeviceExportOptions.cs | 2 - .../Devices/Exporting/DeviceExportRecord.cs | 1 - Disco.Models/UI/Device/DeviceShowModel.cs | 1 - Disco.Models/UI/Job/JobShowModel.cs | 1 - Disco.Models/UI/User/UserShowModel.cs | 1 - .../Devices/Exporting/DeviceExport.cs | 23 +- Disco.Services/Expressions/Expression.cs | 13 - .../DetailsProviderExtensions.cs | 24 +- .../DetailsProvider/DetailsProviderFeature.cs | 1 + .../DetailsProvider/DetailsProviderService.cs | 73 --- Disco.Web/Models/Device/ShowModel.cs | 1 - Disco.Web/Models/Job/ShowModel.cs | 1 - Disco.Web/Models/User/ShowModel.cs | 1 - .../Views/Device/DeviceParts/_Subject.cshtml | 31 - .../Device/DeviceParts/_Subject.generated.cs | 610 +++++++----------- Disco.Web/Views/Job/JobParts/_Subject.cshtml | 11 - .../Views/Job/JobParts/_Subject.generated.cs | 501 +++++++------- .../Views/User/UserParts/_Subject.cshtml | 11 - .../User/UserParts/_Subject.generated.cs | 364 +++++------ 19 files changed, 617 insertions(+), 1054 deletions(-) diff --git a/Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs b/Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs index 46846510..72391130 100644 --- a/Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs +++ b/Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs @@ -130,8 +130,6 @@ namespace Disco.Models.Services.Devices.Exporting public bool DetailBattery { get; set; } [Display(ShortName = "Details", Name = "Keyboard", Description = "The Keyboard associated with the device")] public bool DetailKeyboard { get; set; } - [Display(ShortName = "Details", Name = "Custom Details", Description = "Custom details provided by plugins")] - public bool DetailCustom { get; set; } public static DeviceExportOptions DefaultOptions() { diff --git a/Disco.Models/Services/Devices/Exporting/DeviceExportRecord.cs b/Disco.Models/Services/Devices/Exporting/DeviceExportRecord.cs index 8e5c5cd3..55bd16ce 100644 --- a/Disco.Models/Services/Devices/Exporting/DeviceExportRecord.cs +++ b/Disco.Models/Services/Devices/Exporting/DeviceExportRecord.cs @@ -21,7 +21,6 @@ namespace Disco.Models.Services.Devices.Exporting public List DeviceDetailLanMacAddresses { get; set; } public List DeviceDetailWlanMacAddresses { get; set; } public List DeviceDetailBatteries { get; set; } - public Dictionary DeviceDetailCustom { get; set; } // Model public int? ModelId { get; set; } diff --git a/Disco.Models/UI/Device/DeviceShowModel.cs b/Disco.Models/UI/Device/DeviceShowModel.cs index 8d19c50b..de6222ef 100644 --- a/Disco.Models/UI/Device/DeviceShowModel.cs +++ b/Disco.Models/UI/Device/DeviceShowModel.cs @@ -21,7 +21,6 @@ namespace Disco.Models.UI.Device List DocumentTemplates { get; set; } List DocumentTemplatePackages { get; set; } - DetailsResult DeviceDetails { get; set; } DetailsResult AssignedUserDetails { get; set; } bool HasAssignedUserPhoto { get; set; } } diff --git a/Disco.Models/UI/Job/JobShowModel.cs b/Disco.Models/UI/Job/JobShowModel.cs index 89caf2fc..494610c6 100644 --- a/Disco.Models/UI/Job/JobShowModel.cs +++ b/Disco.Models/UI/Job/JobShowModel.cs @@ -20,6 +20,5 @@ namespace Disco.Models.UI.Job List LocationOptions { get; set; } DetailsResult UserDetails { get; set; } bool HasUserPhoto { get; set; } - DetailsResult DeviceDetails { get; set; } } } diff --git a/Disco.Models/UI/User/UserShowModel.cs b/Disco.Models/UI/User/UserShowModel.cs index 64c42601..483471c8 100644 --- a/Disco.Models/UI/User/UserShowModel.cs +++ b/Disco.Models/UI/User/UserShowModel.cs @@ -20,6 +20,5 @@ namespace Disco.Models.UI.User IClaimNavigatorItem ClaimNavigator { get; set; } DetailsResult UserDetails { get; set; } bool HasUserPhoto { get; set; } - Dictionary AssignedDevicesDetails { get; set; } } } \ No newline at end of file diff --git a/Disco.Services/Devices/Exporting/DeviceExport.cs b/Disco.Services/Devices/Exporting/DeviceExport.cs index 9add2332..ee922734 100644 --- a/Disco.Services/Devices/Exporting/DeviceExport.cs +++ b/Disco.Services/Devices/Exporting/DeviceExport.cs @@ -58,11 +58,11 @@ namespace Disco.Services.Devices.Exporting if (Options.DetailBatteries) r.DeviceDetailBatteries = r.DeviceDetails.Batteries(); - var detailsService = new DetailsProviderService(Database); - if (Options.DetailCustom) - r.DeviceDetailCustom = detailsService.GetDetails(r.Device).Details; if (Options.AssignedUserDetailCustom && r.AssignedUser != null) + { + var detailsService = new DetailsProviderService(Database); r.AssignedUserCustomDetails = detailsService.GetDetails(r.AssignedUser).Details; + } }); TaskStatus.UpdateStatus(40, "Building metadata and database query"); @@ -259,14 +259,11 @@ namespace Disco.Services.Devices.Exporting var certificateMaxCount = Math.Max(1, records.Max(r => r.DeviceCertificates?.Count() ?? 0)); var batteriesMaxCount = Math.Max(1, records.Max(r => r.DeviceDetailBatteries?.Count ?? 0)); - IEnumerable deviceDetailCustomKeys = null; IEnumerable assignedUserDetailCustomKeys = null; - if (options.DetailCustom) - deviceDetailCustomKeys = records.Where(r => r.DeviceDetailCustom != null).SelectMany(r => r.DeviceDetailCustom.Keys).Distinct(StringComparer.OrdinalIgnoreCase).ToList(); if (options.AssignedUserDetailCustom) assignedUserDetailCustomKeys = records.Where(r => r.AssignedUserCustomDetails != null).SelectMany(r => r.AssignedUserCustomDetails.Keys).Distinct(StringComparer.OrdinalIgnoreCase).ToList(); - var allAssessors = BuildRecordAccessors(processorMaxCount, memoryMaxCount, diskDriveMaxCount, lanAdapterMaxCount, wlanAdapterMaxCount, certificateMaxCount, batteriesMaxCount, deviceDetailCustomKeys, assignedUserDetailCustomKeys); + var allAssessors = BuildRecordAccessors(processorMaxCount, memoryMaxCount, diskDriveMaxCount, lanAdapterMaxCount, wlanAdapterMaxCount, certificateMaxCount, batteriesMaxCount, assignedUserDetailCustomKeys); return typeof(DeviceExportOptions).GetProperties() .Where(p => p.PropertyType == typeof(bool)) @@ -288,7 +285,7 @@ namespace Disco.Services.Devices.Exporting }).ToList(); } - private static Dictionary> BuildRecordAccessors(int processorMaxCount, int memoryMaxCount, int diskDriveMaxCount, int lanAdapterMaxCount, int wlanAdapterMaxCount, int certificateMaxCount, int batteriesMaxCount, IEnumerable deviceDetailCustomKeys, IEnumerable assignedUserDetailCustomKeys) + private static Dictionary> BuildRecordAccessors(int processorMaxCount, int memoryMaxCount, int diskDriveMaxCount, int lanAdapterMaxCount, int wlanAdapterMaxCount, int certificateMaxCount, int batteriesMaxCount, IEnumerable assignedUserDetailCustomKeys) { const string DateFormat = "yyyy-MM-dd"; const string DateTimeFormat = DateFormat + " HH:mm:ss"; @@ -535,16 +532,6 @@ namespace Disco.Services.Devices.Exporting } metadata.Add(nameof(DeviceExportOptions.DetailBatteries), batteriesFields); metadata.Add(nameof(DeviceExportOptions.DetailKeyboard), new List() { new DeviceExportFieldMetadata(nameof(DeviceExportOptions.DetailKeyboard), typeof(string), r => r.DeviceDetails.Where(dd => dd.Key == DeviceDetail.HardwareKeyKeyboard).Select(dd => dd.Value).FirstOrDefault(), csvStringEncoded) }); - if (deviceDetailCustomKeys != null) - { - var deviceDetailCustomFields = new List(); - foreach (var detailKey in deviceDetailCustomKeys.OrderBy(k => k, StringComparer.OrdinalIgnoreCase)) - { - var key = detailKey; - deviceDetailCustomFields.Add(new DeviceExportFieldMetadata(detailKey, detailKey, typeof(string), r => r.DeviceDetailCustom != null && r.DeviceDetailCustom.TryGetValue(key, out var value) ? value : null, csvStringEncoded)); - } - metadata.Add(nameof(DeviceExportOptions.DetailCustom), deviceDetailCustomFields); - } return metadata; } diff --git a/Disco.Services/Expressions/Expression.cs b/Disco.Services/Expressions/Expression.cs index 95e4371b..1d091a00 100644 --- a/Disco.Services/Expressions/Expression.cs +++ b/Disco.Services/Expressions/Expression.cs @@ -209,16 +209,13 @@ namespace Disco.Services.Expressions if (target is User targetUser) { detailsVariables.Add("UserDetails", new LazyDictionary(() => detailsService.GetDetails(targetUser).Details)); - detailsVariables.Add("AssignedDeviceDetails", targetUser.CurrentDeviceUserAssignments().Select(a => new { a.Device, Details = new LazyDictionary(() => detailsService.GetDetails(targetUser).Details) }).ToDictionary(d => d.Device.SerialNumber, d => d.Details, StringComparer.OrdinalIgnoreCase)); } else if (target is Job targetJob) { detailsVariables.Add("UserDetails", targetJob.User == null ? (IDictionary)new Dictionary() : new LazyDictionary(() => detailsService.GetDetails(targetJob.User).Details)); - detailsVariables.Add("DeviceDetails", targetJob.Device == null ? (IDictionary)new Dictionary() : new LazyDictionary(() => detailsService.GetDetails(targetJob.Device).Details)); } else if (target is Device targetDevice) { - detailsVariables.Add("DeviceDetails", new LazyDictionary(() => detailsService.GetDetails(targetDevice).Details)); detailsVariables.Add("UserDetails", targetDevice.AssignedUser == null ? (IDictionary)new Dictionary() : new LazyDictionary(() => detailsService.GetDetails(targetDevice.AssignedUser).Details)); } } @@ -285,16 +282,6 @@ namespace Disco.Services.Expressions "#UserDetails", typeof(Dictionary).AssemblyQualifiedName }, - - { - "#DeviceDetails", - typeof(Dictionary).AssemblyQualifiedName - }, - - { - "#AssignedDeviceDetails", - typeof(Dictionary>).AssemblyQualifiedName - }, }; } public static Dictionary ExtensionLibraryTypes() diff --git a/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderExtensions.cs b/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderExtensions.cs index 9a84b792..c403e293 100644 --- a/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderExtensions.cs +++ b/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderExtensions.cs @@ -1,9 +1,7 @@ using Disco.Data.Repository; -using Disco.Models.Services.Plugins.Details; using Disco.Models.UI.Device; using Disco.Models.UI.Job; using Disco.Models.UI.User; -using System.Collections.Generic; namespace Disco.Services.Plugins.Features.DetailsProvider { @@ -16,27 +14,13 @@ namespace Disco.Services.Plugins.Features.DetailsProvider model.UserDetails = service.GetDetails(model.User); model.HasUserPhoto = service.HasUserPhoto(model.User); - - var currentAssignments = model.User.CurrentDeviceUserAssignments(); - if (currentAssignments.Count > 0) - { - model.AssignedDevicesDetails = new Dictionary(currentAssignments.Count); - - foreach (var device in currentAssignments) - { - model.AssignedDevicesDetails[device.DeviceSerialNumber] = service.GetDetails(device.Device); - } - } } public static void PopulateDetails(this DeviceShowModel model, DiscoDataContext database) { - var service = new DetailsProviderService(database); - - model.DeviceDetails = service.GetDetails(model.Device); - if (model.Device.AssignedUser != null) { + var service = new DetailsProviderService(database); model.AssignedUserDetails = service.GetDetails(model.Device.AssignedUser); model.HasAssignedUserPhoto = service.HasUserPhoto(model.Device.AssignedUser); } @@ -44,13 +28,9 @@ namespace Disco.Services.Plugins.Features.DetailsProvider public static void PopulateDetails(this JobShowModel model, DiscoDataContext database) { - var service = new DetailsProviderService(database); - - if (model.Job.Device != null) - model.DeviceDetails = service.GetDetails(model.Job.Device); - if (model.Job.User != null) { + var service = new DetailsProviderService(database); model.UserDetails = service.GetDetails(model.Job.User); model.HasUserPhoto = service.HasUserPhoto(model.Job.User); } diff --git a/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderFeature.cs b/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderFeature.cs index 5d612352..bd48240a 100644 --- a/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderFeature.cs +++ b/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderFeature.cs @@ -9,6 +9,7 @@ namespace Disco.Services.Plugins.Features.DetailsProvider public abstract class DetailsProviderFeature : PluginFeature { public abstract DetailsResult GetDetails(DiscoDataContext database, User user, DateTime? cacheTimestamp); + [Obsolete("Never used")] public abstract DetailsResult GetDetails(DiscoDataContext database, Device device, DateTime? cacheTimestamp); public abstract byte[] GetUserPhoto(DiscoDataContext database, User user, DateTime? cacheTimestamp); } diff --git a/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderService.cs b/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderService.cs index a6a31eb1..a8074417 100644 --- a/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderService.cs +++ b/Disco.Services/Plugins/Features/DetailsProvider/DetailsProviderService.cs @@ -158,78 +158,5 @@ namespace Disco.Services.Plugins.Features.DetailsProvider return result; } - - public DetailsResult GetDetails(Device device) - { - var result = new DetailsResult(); - var saveChangesRequired = false; - - if (!UserService.CurrentAuthorization.HasAll(Claims.Device.Show, Claims.Device.ShowDetails)) - return result; - - var features = Plugins.GetPluginFeatures(typeof(DetailsProviderFeature)); - - if (features.Count == 0) - return result; - - var cache = device.DeviceDetails?.Where(d => d.Scope == DetailsScope).ToDictionary(d => d.Key, d => new { DbDetails = d, Details = JsonConvert.DeserializeObject(d.Value) }, StringComparer.OrdinalIgnoreCase); - - foreach (var feature in features) - { - var featureResult = default(DetailsResult); - if (!cache.TryGetValue(feature.Id, out var cacheResult) || cacheResult.Details.ExpiresOn < DateTime.Now || cacheResult.Details.GatheredOn < database.DiscoConfiguration.PluginDetailsCacheExpiration) - { - var timestamp = cacheResult?.Details.GatheredOn; - if (timestamp.HasValue && timestamp.Value < database.DiscoConfiguration.PluginDetailsCacheExpiration) - timestamp = null; - - try - { - var featureInstance = feature.CreateInstance(); - featureResult = featureInstance.GetDetails(database, device, timestamp); - - if (featureResult != null) - { - if (featureResult.ExpiresOn > DateTime.Now) - { - if (cacheResult == null) - database.DeviceDetails.Add(new DeviceDetail() { DeviceSerialNumber = device.SerialNumber, Scope = DetailsScope, Key = feature.Id, Value = JsonConvert.SerializeObject(featureResult) }); - else - cacheResult.DbDetails.Value = JsonConvert.SerializeObject(featureResult); - saveChangesRequired = true; - } - else if (cacheResult != null) - { - database.DeviceDetails.Remove(cacheResult.DbDetails); - saveChangesRequired = true; - } - } - } - catch (Exception) - { - // ignore exceptions when plugins behave badly - } - } - else - { - featureResult = cacheResult.Details; - } - - // apply feature results - if (featureResult != null) - { - result.SetExpiration(featureResult.ExpiresOn); - foreach (var value in featureResult.Details) - { - result.Details[value.Key] = value.Value; - } - } - } - - if (saveChangesRequired) - database.SaveChanges(); - - return result; - } } } diff --git a/Disco.Web/Models/Device/ShowModel.cs b/Disco.Web/Models/Device/ShowModel.cs index cc819348..ce7ddf80 100644 --- a/Disco.Web/Models/Device/ShowModel.cs +++ b/Disco.Web/Models/Device/ShowModel.cs @@ -35,7 +35,6 @@ namespace Disco.Web.Models.Device HandlersPresent = Plugins.GetPluginFeatures(typeof(DocumentHandlerProviderFeature)).Any(), }; - public DetailsResult DeviceDetails { get; set; } public DetailsResult AssignedUserDetails { get; set; } public bool HasAssignedUserPhoto { get; set; } } diff --git a/Disco.Web/Models/Job/ShowModel.cs b/Disco.Web/Models/Job/ShowModel.cs index 28f32569..39970fc5 100644 --- a/Disco.Web/Models/Job/ShowModel.cs +++ b/Disco.Web/Models/Job/ShowModel.cs @@ -36,6 +36,5 @@ namespace Disco.Web.Models.Job public DetailsResult UserDetails { get; set; } public bool HasUserPhoto { get; set; } - public DetailsResult DeviceDetails { get; set; } } } \ No newline at end of file diff --git a/Disco.Web/Models/User/ShowModel.cs b/Disco.Web/Models/User/ShowModel.cs index 65f8b172..4247cd35 100644 --- a/Disco.Web/Models/User/ShowModel.cs +++ b/Disco.Web/Models/User/ShowModel.cs @@ -33,7 +33,6 @@ namespace Disco.Web.Models.User public DetailsResult UserDetails { get; set; } public bool HasUserPhoto { get; set; } - public Dictionary AssignedDevicesDetails { get; set; } public FancyTreeNode[] ClaimNavigatorFancyTreeNodes { diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml index 7e56be98..ee6550d5 100644 --- a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml +++ b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml @@ -187,37 +187,6 @@ - @if (Model.DeviceDetails != null && Model.DeviceDetails.Details.Count(d => !d.Key.EndsWith("&")) > 0) - { -
- @foreach (var detail in Model.DeviceDetails.Details.Where(d => !d.Key.EndsWith("&"))) - { -
- @detail.Key.TrimEnd('*'): - @if (detail.Key.EndsWith("*")) - { - [reveal] - - } - else - { - @Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail) - } -
- } - -
- }
@{ var assignedUser = Model.Device.AssignedUser; diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs index 37780ddd..32ac989b 100644 --- a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs +++ b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs @@ -776,164 +776,20 @@ WriteLiteral("\', function (response, result) {\r\n #line default #line hidden WriteLiteral(" \r\n \r\n \r\n"); - - - #line 190 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 190 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - if (Model.DeviceDetails != null && Model.DeviceDetails.Details.Count(d => !d.Key.EndsWith("&")) > 0) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - #line 193 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 193 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - foreach (var detail in Model.DeviceDetails.Details.Where(d => !d.Key.EndsWith("&"))) - { - - - #line default - #line hidden -WriteLiteral("
\r\n "); - - - #line 196 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - Write(detail.Key.TrimEnd('*')); - - - #line default - #line hidden -WriteLiteral(":\r\n"); - - - #line 197 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 197 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - if (detail.Key.EndsWith("*")) - { - - - #line default - #line hidden -WriteLiteral(" [reveal]\r\n"); - -WriteLiteral(" "); - - - #line 200 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - #line 201 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - } - else - { - - - #line default - #line hidden - - #line 204 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); - - - #line default - #line hidden - - #line 204 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - - } - - - #line default - #line hidden -WriteLiteral("
\r\n"); - - - #line 207 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" - $(() => { - $('#Device_Show_CustomDetails').on('click', 'a.reveal', e => { - e.preventDefault(); - const t = $(e.currentTarget); - t.next('span.reveal').removeClass('hidden'); - t.remove(); - return false; - }) - }); - -
-"); - - - #line 220 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n"); - #line 222 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 191 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 222 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 191 "..\..\Views\Device\DeviceParts\_Subject.cshtml" var assignedUser = Model.Device.AssignedUser; @@ -949,13 +805,13 @@ WriteLiteral(">\r\n \r\n < " \r\n"); - #line 231 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 200 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 231 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 200 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (assignedUser != null) { @@ -966,27 +822,27 @@ WriteLiteral(" (Model.HasAssignedUserPhoto ? "hasPhoto" : "noPhoto" + #line 202 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create(" ", 11713), Tuple.Create(Model.HasAssignedUserPhoto ? "hasPhoto" : "noPhoto" #line default #line hidden -, 13465), false) +, 11714), false) ); WriteLiteral(">\r\n"); - #line 234 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 203 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 234 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 203 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.HasAssignedUserPhoto) { @@ -1001,20 +857,20 @@ WriteLiteral(">\r\n (Url.Action(MVC.API.User.Photo(assignedUser.UserId)) + #line 206 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 12064), Tuple.Create(Url.Action(MVC.API.User.Photo(assignedUser.UserId)) #line default #line hidden -, 13815), false) +, 12064), false) ); WriteLiteral(" />\r\n \r\n"); - #line 239 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 208 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1029,13 +885,13 @@ WriteLiteral(" title=\"Display Name\""); WriteLiteral(">\r\n"); - #line 241 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 210 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 241 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 210 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.User.Show)) { @@ -1043,14 +899,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 243 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 212 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLink(assignedUser.DisplayName, MVC.User.Show(assignedUser.UserId))); #line default #line hidden - #line 243 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 212 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else @@ -1060,14 +916,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 247 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 216 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(assignedUser.DisplayName); #line default #line hidden - #line 247 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 216 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1084,7 +940,7 @@ WriteLiteral(" title=\"Id\""); WriteLiteral(">"); - #line 250 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 219 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(assignedUser.FriendlyId()); @@ -1093,13 +949,13 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 251 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 220 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 251 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 220 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowDetails)) { if (!string.IsNullOrWhiteSpace(assignedUser.PhoneNumber)) @@ -1116,21 +972,21 @@ WriteLiteral(" title=\"Phone Number\""); WriteLiteral(">(assignedUser.PhoneNumber + #line 224 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 13414), Tuple.Create(assignedUser.PhoneNumber #line default #line hidden -, 15165), false) +, 13414), false) ); WriteLiteral(">"); - #line 255 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 224 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(assignedUser.PhoneNumber); @@ -1139,7 +995,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 256 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 225 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } if (!string.IsNullOrWhiteSpace(assignedUser.EmailAddress)) { @@ -1155,21 +1011,21 @@ WriteLiteral(" title=\"Email Address\""); WriteLiteral(">(Model.Device.AssignedUser.EmailAddress + #line 228 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 13802), Tuple.Create(Model.Device.AssignedUser.EmailAddress #line default #line hidden -, 15553), false) +, 13802), false) ); WriteLiteral(">"); - #line 259 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 228 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(assignedUser.EmailAddress); @@ -1178,7 +1034,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 260 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 229 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } } @@ -1188,7 +1044,7 @@ WriteLiteral("\r\n"); WriteLiteral(" "); - #line 262 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 231 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowFlagAssignments)) { @@ -1202,13 +1058,13 @@ WriteLiteral(" id=\"Device_Show_User_Flags\""); WriteLiteral(">\r\n"); - #line 265 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 234 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 265 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 234 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var flag in assignedUser.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId)))) { @@ -1217,26 +1073,26 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (flag.Item2.Icon + #line 236 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 14530), Tuple.Create(flag.Item2.Icon #line default #line hidden -, 16281), false) -, Tuple.Create(Tuple.Create(" ", 16299), Tuple.Create("fa-fw", 16300), true) -, Tuple.Create(Tuple.Create(" ", 16305), Tuple.Create("d-", 16306), true) +, 14530), false) +, Tuple.Create(Tuple.Create(" ", 14548), Tuple.Create("fa-fw", 14549), true) +, Tuple.Create(Tuple.Create(" ", 14554), Tuple.Create("d-", 14555), true) - #line 267 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 16308), Tuple.Create(flag.Item2.IconColour + #line 236 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 14557), Tuple.Create(flag.Item2.IconColour #line default #line hidden -, 16308), false) +, 14557), false) ); WriteLiteral(">\r\n "); - #line 269 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 238 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(flag.Item2.Name); @@ -1259,7 +1115,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 269 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 238 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (flag.Item1.Comments != null) { @@ -1272,7 +1128,7 @@ WriteLiteral(" class=\"comments\""); WriteLiteral(">"); - #line 270 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 239 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(flag.Item1.Comments.ToHtmlComment()); @@ -1281,7 +1137,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 270 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 239 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } #line default @@ -1293,7 +1149,7 @@ WriteLiteral(" class=\"added\""); WriteLiteral(">"); - #line 270 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 239 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); @@ -1303,7 +1159,7 @@ WriteLiteral("\r\n " \r\n"); - #line 273 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 242 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1346,7 +1202,7 @@ WriteLiteral(">\r\n $(functio " \r\n \r\n"); - #line 305 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 274 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1355,7 +1211,7 @@ WriteLiteral(">\r\n $(functio WriteLiteral(" "); - #line 306 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 275 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.AssignedUserDetails != null && Model.AssignedUserDetails.Details.Count(d => !d.Key.EndsWith("&")) > 0) { @@ -1371,13 +1227,13 @@ WriteLiteral(" class=\"status clearfix\""); WriteLiteral(">\r\n"); - #line 309 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 278 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 309 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 278 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var detail in Model.AssignedUserDetails.Details.Where(d => !d.Key.EndsWith("&"))) { @@ -1388,7 +1244,7 @@ WriteLiteral("
\r\n " "); - #line 312 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 281 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(detail.Key.TrimEnd('*')); @@ -1397,13 +1253,13 @@ WriteLiteral("
\r\n WriteLiteral(":\r\n"); - #line 313 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 282 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 313 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 282 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (detail.Key.EndsWith("*")) { @@ -1425,7 +1281,7 @@ WriteLiteral(" class=\"reveal hidden\""); WriteLiteral(">"); - #line 316 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 285 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); @@ -1434,7 +1290,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 317 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 286 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -1443,14 +1299,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 320 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 289 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); #line default #line hidden - #line 320 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 289 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1460,7 +1316,7 @@ WriteLiteral("\r\n"); WriteLiteral("
\r\n"); - #line 323 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 292 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1485,7 +1341,7 @@ WriteLiteral(@"> "); - #line 336 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 305 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1494,7 +1350,7 @@ WriteLiteral(@"> WriteLiteral("
\r\n"); - #line 338 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 307 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -1509,7 +1365,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Not Assigned\r\n"); - #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 311 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1519,13 +1375,13 @@ WriteLiteral(" \r\n " \r\n \r\n"); - #line 347 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 316 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 347 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 316 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.Device.Actions.GenerateDocuments)) { @@ -1543,7 +1399,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 350 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 319 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._GenerateDocumentControl, Model.GenerateDocumentControlModel)); @@ -1552,7 +1408,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n"); - #line 352 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 321 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1575,13 +1431,13 @@ WriteLiteral(" title=\"Device Profile\""); WriteLiteral(">\r\n"); - #line 359 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 328 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 359 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 328 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.Config.DeviceProfile.Show)) { @@ -1589,14 +1445,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 361 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 330 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLink(Model.Device.DeviceProfile.Name, MVC.Config.DeviceProfile.Index(Model.Device.DeviceProfileId))); #line default #line hidden - #line 361 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 330 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else @@ -1606,14 +1462,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 365 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 334 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfile.Name); #line default #line hidden - #line 365 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 334 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1635,7 +1491,7 @@ WriteLiteral(">Distribution:\r\n \r\n WriteLiteral(" "); - #line 374 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 343 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfile.DistributionType.ToString()); @@ -1651,13 +1507,13 @@ WriteLiteral(">Address:\r\n \r\n "\r\n"); - #line 382 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 351 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 382 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 351 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.DeviceProfileDefaultOrganisationAddress != null) { @@ -1672,7 +1528,7 @@ WriteLiteral(" id=\"Device_Show_Policies_Profile_Address\""); WriteLiteral(">"); - #line 385 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 354 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.DeviceProfileDefaultOrganisationAddress.Name); @@ -1681,7 +1537,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 386 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 355 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -1698,7 +1554,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">None\r\n"); - #line 390 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 359 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1716,7 +1572,7 @@ WriteLiteral(">Provision Account:\r\n \r\ WriteLiteral(" "); - #line 399 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 368 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfile.ProvisionADAccount ? "Active Directory" : "No"); @@ -1734,7 +1590,7 @@ WriteLiteral(">Certificates:\r\n \r\n WriteLiteral(" "); - #line 407 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 376 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.DeviceProfileCertificateProviders != null ? string.Join(", ", Model.DeviceProfileCertificateProviders.Select(c => c.Name)) : "None Provisioned"); @@ -1751,7 +1607,7 @@ WriteLiteral(">Wireless Profiles:\r\n \r\ WriteLiteral(" "); - #line 414 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 383 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.DeviceProfileWirelessProfileProviders != null ? string.Join(", ", Model.DeviceProfileWirelessProfileProviders.Select(c => c.Name)) : "None Provisioned"); @@ -1761,13 +1617,13 @@ WriteLiteral("\r\n \r\n < " \r\n"); - #line 418 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 387 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 418 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 387 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateDeviceProfile()) { @@ -1775,14 +1631,14 @@ WriteLiteral("\r\n \r\n < #line default #line hidden - #line 420 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 389 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Update Profile", MVC.API.Device.UpdateDeviceProfileId(Model.Device.SerialNumber, redirect: true), "Device_Show_Policies_Profile_Actions_Update_Button")); #line default #line hidden - #line 420 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 389 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -1804,13 +1660,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 425 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 394 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 425 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 394 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var dp in Model.DeviceProfiles.OrderBy(i => i.Name)) { @@ -1825,7 +1681,7 @@ WriteLiteral(" type=\"radio\""); WriteLiteral(" data-deviceprofileid=\""); - #line 428 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 397 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(dp.Id); @@ -1835,45 +1691,45 @@ WriteLiteral("\""); WriteLiteral(" name=\"DeviceProfile\""); -WriteAttribute("id", Tuple.Create(" id=\"", 27038), Tuple.Create("\"", 27065) -, Tuple.Create(Tuple.Create("", 27043), Tuple.Create("DeviceProfile_", 27043), true) +WriteAttribute("id", Tuple.Create(" id=\"", 25287), Tuple.Create("\"", 25314) +, Tuple.Create(Tuple.Create("", 25292), Tuple.Create("DeviceProfile_", 25292), true) - #line 428 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 27057), Tuple.Create(dp.Id + #line 397 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 25306), Tuple.Create(dp.Id #line default #line hidden -, 27057), false) +, 25306), false) ); WriteLiteral(" />(dp.Id + #line 397 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 25344), Tuple.Create(dp.Id #line default #line hidden -, 27095), false) +, 25344), false) ); -WriteAttribute("title", Tuple.Create(" title=\"", 27104), Tuple.Create("\"", 27148) -, Tuple.Create(Tuple.Create("", 27112), Tuple.Create("Distribution:", 27112), true) +WriteAttribute("title", Tuple.Create(" title=\"", 25353), Tuple.Create("\"", 25397) +, Tuple.Create(Tuple.Create("", 25361), Tuple.Create("Distribution:", 25361), true) - #line 428 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create(" ", 27125), Tuple.Create(dp.DistributionType + #line 397 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create(" ", 25374), Tuple.Create(dp.DistributionType #line default #line hidden -, 27126), false) +, 25375), false) ); WriteLiteral(">"); - #line 428 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 397 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(dp.Name); @@ -1882,7 +1738,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 430 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 399 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1895,7 +1751,7 @@ WriteLiteral(" \r\n"); - #line 783 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 752 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2768,7 +2624,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 784 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 753 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateUntrustEnrol()) { @@ -2776,14 +2632,14 @@ WriteLiteral(" "); #line default #line hidden - #line 786 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 755 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Untrust Enrol", MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, false.ToString(), true), "Device_Show_Device_Actions_UntrustEnrol_Button")); #line default #line hidden - #line 786 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 755 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -2854,7 +2710,7 @@ WriteLiteral(@"> "); - #line 826 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 795 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2863,7 +2719,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 827 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 796 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanDecommission()) { @@ -2871,14 +2727,14 @@ WriteLiteral(" "); #line default #line hidden - #line 829 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 798 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Decommission", MVC.API.Device.Decommission(), "Device_Show_Device_Actions_Decommission_Button")); #line default #line hidden - #line 829 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 798 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -2910,13 +2766,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 836 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 805 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 836 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 805 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)).Cast().OrderBy(r => r.ToString())) { @@ -2927,34 +2783,34 @@ WriteLiteral("
  • \r\n WriteLiteral(" type=\"radio\""); -WriteAttribute("id", Tuple.Create(" id=\"", 51674), Tuple.Create("\"", 51752) -, Tuple.Create(Tuple.Create("", 51679), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 51679), true) +WriteAttribute("id", Tuple.Create(" id=\"", 49923), Tuple.Create("\"", 50001) +, Tuple.Create(Tuple.Create("", 49928), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 49928), true) - #line 839 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 51726), Tuple.Create((int)decommissionReason + #line 808 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 49975), Tuple.Create((int)decommissionReason #line default #line hidden -, 51726), false) +, 49975), false) ); WriteLiteral("\r\n name=\"Device_Show_Device_Actions_Dec" + "ommission_Reason\""); -WriteAttribute("value", Tuple.Create(" value=\"", 51851), Tuple.Create("\"", 51885) +WriteAttribute("value", Tuple.Create(" value=\"", 50100), Tuple.Create("\"", 50134) - #line 840 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 51859), Tuple.Create((int)decommissionReason + #line 809 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 50108), Tuple.Create((int)decommissionReason #line default #line hidden -, 51859), false) +, 50108), false) ); WriteLiteral(" "); - #line 840 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 809 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write((decommissionReason == DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty); @@ -2962,21 +2818,21 @@ WriteLiteral(" "); #line hidden WriteLiteral(" />\r\n ((int)decommissionReason + #line 810 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 50331), Tuple.Create((int)decommissionReason #line default #line hidden -, 52082), false) +, 50331), false) ); WriteLiteral(">"); - #line 841 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 810 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(decommissionReason.ReasonMessage()); @@ -2985,7 +2841,7 @@ WriteLiteral(">"); WriteLiteral("\r\n
    • \r\n"); - #line 843 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 812 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3003,7 +2859,7 @@ WriteLiteral(">\r\n $(function () {\r\n "uttonDialog = null;\r\n var deviceSerialNumber = \'"); - #line 851 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 820 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.SerialNumber); @@ -3036,7 +2892,7 @@ WriteLiteral("\';\r\n\r\n button.click(function () {\r\n\ " });\r\n \r\n"); - #line 887 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 856 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3045,7 +2901,7 @@ WriteLiteral("\';\r\n\r\n button.click(function () {\r\n\ WriteLiteral(" "); - #line 888 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 857 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanRecommission()) { @@ -3053,14 +2909,14 @@ WriteLiteral(" "); #line default #line hidden - #line 890 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 859 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Recommission", MVC.API.Device.Recommission(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Recommission_Button")); #line default #line hidden - #line 890 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 859 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -3114,7 +2970,7 @@ WriteLiteral(@"> "); - #line 925 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 894 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3123,7 +2979,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 926 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 895 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanDelete()) { @@ -3131,14 +2987,14 @@ WriteLiteral(" "); #line default #line hidden - #line 928 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 897 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Delete Device", MVC.API.Device.Delete(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Delete_Button")); #line default #line hidden - #line 928 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 897 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -3198,7 +3054,7 @@ WriteLiteral(@"> "); - #line 966 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 935 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } diff --git a/Disco.Web/Views/Job/JobParts/_Subject.cshtml b/Disco.Web/Views/Job/JobParts/_Subject.cshtml index 9f5ec6b2..bc774ae2 100644 --- a/Disco.Web/Views/Job/JobParts/_Subject.cshtml +++ b/Disco.Web/Views/Job/JobParts/_Subject.cshtml @@ -254,17 +254,6 @@ } } - @if (Model.DeviceDetails != null && Model.DeviceDetails.Details.Count > 0) - { -
    - @foreach (var detail in Model.DeviceDetails.Details) - { -
    - @detail.Key: @Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail) -
    - } -
    - } @if (Model.Job.DeviceHeld.HasValue) { var canEditLocation = Authorization.Has(Claims.Job.Properties.DeviceHeldLocation); diff --git a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs index 5738444c..162b57cc 100644 --- a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs +++ b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs @@ -1097,75 +1097,6 @@ WriteLiteral(" \r\n"); #line hidden #line 257 "..\..\Views\Job\JobParts\_Subject.cshtml" - if (Model.DeviceDetails != null && Model.DeviceDetails.Details.Count > 0) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - #line 260 "..\..\Views\Job\JobParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 260 "..\..\Views\Job\JobParts\_Subject.cshtml" - foreach (var detail in Model.DeviceDetails.Details) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - #line 263 "..\..\Views\Job\JobParts\_Subject.cshtml" - Write(detail.Key); - - - #line default - #line hidden -WriteLiteral(": "); - - - #line 263 "..\..\Views\Job\JobParts\_Subject.cshtml" - Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - #line 265 "..\..\Views\Job\JobParts\_Subject.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - #line 267 "..\..\Views\Job\JobParts\_Subject.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" "); - - - #line 268 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceHeld.HasValue) { var canEditLocation = Authorization.Has(Claims.Job.Properties.DeviceHeldLocation); @@ -1192,13 +1123,13 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_Location\""); WriteLiteral(">\r\n"); - #line 277 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 266 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 277 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 266 "..\..\Views\Job\JobParts\_Subject.cshtml" if (canEditLocation) { switch (Model.LocationMode) @@ -1210,14 +1141,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 283 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" })); #line default #line hidden - #line 283 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 272 "..\..\Views\Job\JobParts\_Subject.cshtml" break; case LocationModes.RestrictedList: @@ -1232,14 +1163,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 292 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 281 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.DropDownListFor(m => m.Job.DeviceHeldLocation, listOptions, new { @class = "small discreet" })); #line default #line hidden - #line 292 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 281 "..\..\Views\Job\JobParts\_Subject.cshtml" ; break; } @@ -1248,27 +1179,27 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 284 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 284 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 284 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 284 "..\..\Views\Job\JobParts\_Subject.cshtml" } else if (string.IsNullOrEmpty(Model.Job.DeviceHeldLocation)) @@ -1284,7 +1215,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None/Unknown>\r\n"); - #line 300 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml" } else { @@ -1293,14 +1224,14 @@ WriteLiteral("><None/Unknown>\r\n"); #line default #line hidden - #line 303 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 292 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.DeviceHeldLocation); #line default #line hidden - #line 303 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 292 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1319,7 +1250,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceHeld\""); WriteLiteral(">"); - #line 310 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 299 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceHeld, Model.Job.DeviceHeldTechUser)); @@ -1328,13 +1259,13 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 312 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 301 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 312 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 301 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceReadyForReturn.HasValue) { @@ -1349,7 +1280,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReadyForReturn\""); WriteLiteral(">"); - #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 305 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReadyForReturn, Model.Job.DeviceReadyForReturnTechUser)); @@ -1358,7 +1289,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 318 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 307 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1367,7 +1298,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" "); - #line 319 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 308 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceReturnedDate.HasValue) { @@ -1382,7 +1313,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReturnedDate\""); WriteLiteral(">"); - #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 312 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReturnedDate, Model.Job.DeviceReturnedTechUser)); @@ -1391,7 +1322,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 325 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 314 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1400,13 +1331,13 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" \r\n"); - #line 327 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 327 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml" if (canEditLocation) { @@ -1420,13 +1351,13 @@ WriteLiteral(" type=\"text/javascript\""); WriteLiteral(">\r\n $(function () {\r\n"); - #line 331 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 320 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 331 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 320 "..\..\Views\Job\JobParts\_Subject.cshtml" switch (Model.LocationMode) { case LocationModes.Unrestricted: @@ -1453,7 +1384,7 @@ WriteLiteral(@" url: '"); - #line 348 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 337 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.DeviceHeldLocations())); @@ -1510,7 +1441,7 @@ WriteLiteral("\',\r\n dat " url: \'"); - #line 399 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 388 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))); @@ -1538,7 +1469,7 @@ WriteLiteral(@"', WriteLiteral("\r\n"); - #line 417 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 406 "..\..\Views\Job\JobParts\_Subject.cshtml" break; case LocationModes.RestrictedList: @@ -1554,7 +1485,7 @@ WriteLiteral(@" '"); - #line 423 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 412 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))); @@ -1566,7 +1497,7 @@ WriteLiteral("\',\r\n \'DeviceHeldLoc WriteLiteral("\r\n"); - #line 426 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 415 "..\..\Views\Job\JobParts\_Subject.cshtml" break; } @@ -1577,7 +1508,7 @@ WriteLiteral("\r\n\r\n });\r\n "ript>\r\n"); - #line 432 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 421 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1586,7 +1517,7 @@ WriteLiteral("\r\n\r\n });\r\n WriteLiteral(" \r\n"); - #line 434 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 423 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1595,7 +1526,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" \r\n \r\n"); - #line 437 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 426 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1604,7 +1535,7 @@ WriteLiteral(" \r\n \r\n"); WriteLiteral(" "); - #line 438 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 427 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -1618,13 +1549,13 @@ WriteLiteral(" id=\"Job_Show_User\""); WriteLiteral(">\r\n
    \r\n"); - #line 442 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 431 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 442 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 431 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.HasUserPhoto) { @@ -1639,20 +1570,20 @@ WriteLiteral(">\r\n (Url.Action(MVC.API.User.Photo(Model.Job.UserId)) + #line 434 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 29905), Tuple.Create(Url.Action(MVC.API.User.Photo(Model.Job.UserId)) #line default #line hidden -, 30524), false) +, 29905), false) ); WriteLiteral(" />\r\n
    \r\n"); - #line 447 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 436 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1667,27 +1598,27 @@ WriteLiteral(" title=\"Display Name\""); WriteLiteral(">\r\n"); - #line 449 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 438 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 449 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 438 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Authorization.Has(Claims.User.Show)) { #line default #line hidden - #line 450 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 439 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId))); #line default #line hidden - #line 450 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 439 "..\..\Views\Job\JobParts\_Subject.cshtml" } else { @@ -1695,14 +1626,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 452 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 441 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.DisplayName); #line default #line hidden - #line 452 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 441 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1717,7 +1648,7 @@ WriteLiteral(" title=\"Id\""); WriteLiteral(">"); - #line 454 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 443 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.FriendlyId()); @@ -1726,13 +1657,13 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 455 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 444 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 455 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 444 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowDetails)) { if (!string.IsNullOrWhiteSpace(Model.Job.User.PhoneNumber)) @@ -1748,21 +1679,21 @@ WriteLiteral(" title=\"Phone Number\""); WriteLiteral(">Phone: (Model.Job.User.PhoneNumber + #line 447 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 30743), Tuple.Create(Model.Job.User.PhoneNumber #line default #line hidden -, 31362), false) +, 30743), false) ); WriteLiteral(">"); - #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 447 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.PhoneNumber); @@ -1771,7 +1702,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 447 "..\..\Views\Job\JobParts\_Subject.cshtml" } if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress)) { @@ -1786,21 +1717,21 @@ WriteLiteral(" title=\"Email Address\""); WriteLiteral(">Email: (Model.Job.User.EmailAddress + #line 449 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 30997), Tuple.Create(Model.Job.User.EmailAddress #line default #line hidden -, 31616), false) +, 30997), false) ); WriteLiteral(">"); - #line 460 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 449 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.EmailAddress); @@ -1809,7 +1740,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 460 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 449 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -1819,7 +1750,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 462 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 451 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowFlagAssignments)) { @@ -1833,13 +1764,13 @@ WriteLiteral(" id=\"Job_Show_User_Flags\""); WriteLiteral(">\r\n"); - #line 465 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 454 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 465 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 454 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var flag in Model.Job.User.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId)))) { @@ -1848,26 +1779,26 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (flag.Item2.Icon + #line 456 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 31521), Tuple.Create(flag.Item2.Icon #line default #line hidden -, 32140), false) -, Tuple.Create(Tuple.Create(" ", 32158), Tuple.Create("fa-fw", 32159), true) -, Tuple.Create(Tuple.Create(" ", 32164), Tuple.Create("d-", 32165), true) +, 31521), false) +, Tuple.Create(Tuple.Create(" ", 31539), Tuple.Create("fa-fw", 31540), true) +, Tuple.Create(Tuple.Create(" ", 31545), Tuple.Create("d-", 31546), true) - #line 467 "..\..\Views\Job\JobParts\_Subject.cshtml" -, Tuple.Create(Tuple.Create("", 32167), Tuple.Create(flag.Item2.IconColour + #line 456 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 31548), Tuple.Create(flag.Item2.IconColour #line default #line hidden -, 32167), false) +, 31548), false) ); WriteLiteral(">\r\n "); - #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(flag.Item2.Name); @@ -1890,7 +1821,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml" if (flag.Item1.Comments != null) { @@ -1903,7 +1834,7 @@ WriteLiteral(" class=\"comments\""); WriteLiteral(">"); - #line 470 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 459 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(flag.Item1.Comments.ToHtmlComment()); @@ -1912,7 +1843,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 470 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 459 "..\..\Views\Job\JobParts\_Subject.cshtml" } #line default @@ -1924,7 +1855,7 @@ WriteLiteral(" class=\"added\""); WriteLiteral(">"); - #line 470 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 459 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); @@ -1934,7 +1865,7 @@ WriteLiteral("\r\n \r\n " \r\n"); - #line 473 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 462 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1970,7 +1901,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 505 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 494 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1979,7 +1910,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 506 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 495 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.WaitingForUserAction.HasValue) { @@ -1998,7 +1929,7 @@ WriteLiteral(">\r\n

    Awaiting Action

    \r\n WriteLiteral(" data-livestamp=\""); - #line 510 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 499 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.WaitingForUserAction.ToUnixEpoc()); @@ -2009,7 +1940,7 @@ WriteLiteral("\""); WriteLiteral(">"); - #line 510 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 499 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.WaitingForUserAction.ToFullDateTime()); @@ -2018,7 +1949,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 512 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 501 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2027,7 +1958,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" "); - #line 513 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 502 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.UserDetails != null && Model.UserDetails.Details.Count(d => !d.Key.EndsWith("&")) > 0) { @@ -2043,13 +1974,13 @@ WriteLiteral(" class=\"status clearfix\""); WriteLiteral(">\r\n"); - #line 516 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 505 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 516 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 505 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var detail in Model.UserDetails.Details.Where(d => !d.Key.EndsWith("&"))) { @@ -2060,7 +1991,7 @@ WriteLiteral("
    \r\n "g>"); - #line 519 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 508 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(detail.Key.TrimEnd('*')); @@ -2069,13 +2000,13 @@ WriteLiteral("
    \r\n WriteLiteral(":\r\n"); - #line 520 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 509 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 520 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 509 "..\..\Views\Job\JobParts\_Subject.cshtml" if (detail.Key.EndsWith("*")) { @@ -2097,7 +2028,7 @@ WriteLiteral(" class=\"reveal hidden\""); WriteLiteral(">"); - #line 523 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 512 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); @@ -2106,7 +2037,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 524 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 513 "..\..\Views\Job\JobParts\_Subject.cshtml" } else { @@ -2115,14 +2046,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 527 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 516 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); #line default #line hidden - #line 527 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 516 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2132,7 +2063,7 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n"); - #line 530 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 519 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2157,7 +2088,7 @@ WriteLiteral(@"> "); - #line 543 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 532 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2166,7 +2097,7 @@ WriteLiteral(@"> WriteLiteral("
    \r\n \r\n"); - #line 546 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 535 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2183,13 +2114,13 @@ WriteLiteral(" id=\"Job_Show_Job_Actions\""); WriteLiteral(">\r\n"); - #line 550 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 539 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 550 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 539 "..\..\Views\Job\JobParts\_Subject.cshtml" List CanCloseForcedReasons; if (Model.Job.CanCloseForced(out CanCloseForcedReasons)) @@ -2199,14 +2130,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 554 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 543 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Forcibly Close", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_ForceClose_Button")); #line default #line hidden - #line 554 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 543 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2236,13 +2167,13 @@ WriteLiteral(">Are you sure?\r\n "
      \r\n"); - #line 561 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 550 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 561 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 550 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var reason in CanCloseForcedReasons) { @@ -2252,7 +2183,7 @@ WriteLiteral(">Are you sure?\r\n WriteLiteral("
    • "); - #line 563 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 552 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(reason); @@ -2261,7 +2192,7 @@ WriteLiteral("
    • "); WriteLiteral("
      • \r\n"); - #line 564 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 553 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2270,13 +2201,13 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n \r\n"); - #line 567 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 556 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 567 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 556 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.ForceClose(Model.Job.Id, null, true))) { @@ -2294,7 +2225,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 573 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 562 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2329,7 +2260,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 606 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 595 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2338,13 +2269,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral("\r\n\r\n"); - #line 609 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 598 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 609 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 598 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanCloseNormally()) { @@ -2352,14 +2283,14 @@ WriteLiteral("\r\n\r\n"); #line default #line hidden - #line 611 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 600 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Close", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button")); #line default #line hidden - #line 611 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 600 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2405,7 +2336,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n });\r\n \r\n"); - #line 648 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 637 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2414,7 +2345,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 649 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 638 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanReopen()) { @@ -2422,14 +2353,14 @@ WriteLiteral(" "); #line default #line hidden - #line 651 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 640 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Reopen Job", MVC.API.Job.Reopen(Model.Job.Id, true), "Job_Show_Job_Actions_Reopen_Button")); #line default #line hidden - #line 651 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 640 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2476,7 +2407,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 689 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 678 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2485,7 +2416,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 690 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 679 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDelete()) { @@ -2493,14 +2424,14 @@ WriteLiteral(" "); #line default #line hidden - #line 692 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 681 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Delete", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button")); #line default #line hidden - #line 692 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 681 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2548,7 +2479,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 730 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 719 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2557,7 +2488,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 731 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 720 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanAddQueues() && Model.AvailableQueues != null && Model.AvailableQueues.Count > 0) { @@ -2571,14 +2502,14 @@ WriteLiteral(" "); #line default #line hidden - #line 739 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 728 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Add to Queue", MVC.API.JobQueueJob.AddJob(), "Job_Show_Job_Actions_AddQueue_Button")); #line default #line hidden - #line 739 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 728 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2595,13 +2526,13 @@ WriteLiteral(" title=\"Add Job to Queue\""); WriteLiteral(">\r\n"); - #line 741 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 730 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 741 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 730 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.JobQueueJob.AddJob())) { @@ -2626,14 +2557,14 @@ WriteLiteral(" type=\"hidden\""); WriteLiteral(" name=\"JobId\""); -WriteAttribute("value", Tuple.Create(" value=\"", 47731), Tuple.Create("\"", 47752) +WriteAttribute("value", Tuple.Create(" value=\"", 47112), Tuple.Create("\"", 47133) - #line 744 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 47739), Tuple.Create(Model.Job.Id + #line 733 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 47120), Tuple.Create(Model.Job.Id #line default #line hidden -, 47739), false) +, 47120), false) ); WriteLiteral(" />\r\n"); @@ -2645,13 +2576,13 @@ WriteLiteral(" class=\"queuePicker\""); WriteLiteral(">\r\n"); - #line 746 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 735 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 746 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 735 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var jobQueue in Model.AvailableQueues.OrderBy(jq => jq.Name)) { @@ -2665,7 +2596,7 @@ WriteLiteral(" class=\"queue\""); WriteLiteral(" data-queueid=\""); - #line 748 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 737 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.Id); @@ -2676,7 +2607,7 @@ WriteLiteral("\""); WriteLiteral(" data-queuesla=\""); - #line 748 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 737 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.DefaultSLAExpiry.HasValue ? jobQueue.DefaultSLAExpiry.Value.ToString() : null); @@ -2687,7 +2618,7 @@ WriteLiteral("\""); WriteLiteral(" data-queuepriority=\""); - #line 748 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 737 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.Priority.ToString()); @@ -2697,32 +2628,32 @@ WriteLiteral("\""); WriteLiteral(">\r\n (jobQueue.Icon + #line 738 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 47616), Tuple.Create(jobQueue.Icon #line default #line hidden -, 48235), false) -, Tuple.Create(Tuple.Create(" ", 48251), Tuple.Create("fa-fw", 48252), true) -, Tuple.Create(Tuple.Create(" ", 48257), Tuple.Create("fa-lg", 48258), true) -, Tuple.Create(Tuple.Create(" ", 48263), Tuple.Create("d-", 48264), true) +, 47616), false) +, Tuple.Create(Tuple.Create(" ", 47632), Tuple.Create("fa-fw", 47633), true) +, Tuple.Create(Tuple.Create(" ", 47638), Tuple.Create("fa-lg", 47639), true) +, Tuple.Create(Tuple.Create(" ", 47644), Tuple.Create("d-", 47645), true) - #line 749 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 48266), Tuple.Create(jobQueue.IconColour + #line 738 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 47647), Tuple.Create(jobQueue.IconColour #line default #line hidden -, 48266), false) +, 47647), false) ); WriteLiteral(">"); - #line 749 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 738 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.Name); @@ -2731,7 +2662,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 751 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 740 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2749,7 +2680,7 @@ WriteLiteral(">\r\n
    \r\n WriteLiteral(" "); - #line 756 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 745 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.DropDownList("Priority", priorityItems, new { id = "Job_Show_Job_Actions_AddQueue_Priority" })); @@ -2757,27 +2688,27 @@ WriteLiteral(" "); #line hidden WriteLiteral(" (priorityValue.ToLower() + #line 745 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 48088), Tuple.Create(priorityValue.ToLower() #line default #line hidden -, 48707), false) +, 48088), false) ); -WriteAttribute("title", Tuple.Create(" title=\"", 48734), Tuple.Create("\"", 48767) +WriteAttribute("title", Tuple.Create(" title=\"", 48115), Tuple.Create("\"", 48148) - #line 756 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 48742), Tuple.Create(priorityValue + #line 745 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 48123), Tuple.Create(priorityValue #line default #line hidden -, 48742), false) -, Tuple.Create(Tuple.Create(" ", 48758), Tuple.Create("Priority", 48759), true) +, 48123), false) +, Tuple.Create(Tuple.Create(" ", 48139), Tuple.Create("Priority", 48140), true) ); WriteLiteral(">\r\n
    \r\n
    \r\n " + @@ -2786,7 +2717,7 @@ WriteLiteral(">\r\n
    \r\n WriteLiteral(" "); - #line 760 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 749 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.DropDownList("SLAExpiresMinutes", slaOptions, new { id = "Job_Show_Job_Actions_AddQueue_SLAExpiresMinutes" })); @@ -2804,7 +2735,7 @@ WriteLiteral(">\r\n \r\n "\n"); - #line 767 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 756 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2866,7 +2797,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n });\r\n \r\n"); - #line 846 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 835 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2875,7 +2806,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 847 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 836 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogWarranty()) { @@ -2883,14 +2814,14 @@ WriteLiteral(" "); #line default #line hidden - #line 849 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 838 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Log Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button")); #line default #line hidden - #line 849 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 838 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2900,7 +2831,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 851 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 840 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWarrantyCompleted()) { @@ -2908,14 +2839,14 @@ WriteLiteral(" "); #line default #line hidden - #line 853 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 842 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Warranty Complete", MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_WarrantyComplete_Button", "alert")); #line default #line hidden - #line 853 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 842 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2925,7 +2856,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 855 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 844 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanInsuranceClaimFormSent()) { @@ -2933,14 +2864,14 @@ WriteLiteral(" "); #line default #line hidden - #line 857 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 846 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert")); #line default #line hidden - #line 857 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 846 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2950,7 +2881,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 859 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 848 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogRepair()) { @@ -2958,14 +2889,14 @@ WriteLiteral(" "); #line default #line hidden - #line 861 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 850 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Log Repair", MVC.Job.LogRepair(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogRepair_Button")); #line default #line hidden - #line 861 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 850 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2975,7 +2906,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 863 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 852 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanRepairComplete()) { @@ -2983,14 +2914,14 @@ WriteLiteral(" "); #line default #line hidden - #line 865 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 854 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Repairs Complete", MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_RepairComplete_Button", "alert")); #line default #line hidden - #line 865 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 854 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3000,7 +2931,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 867 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 856 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanConvertHWarToHNWar()) { @@ -3008,14 +2939,14 @@ WriteLiteral(" "); #line default #line hidden - #line 869 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 858 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button")); #line default #line hidden - #line 869 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 858 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3063,7 +2994,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 909 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 898 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3072,13 +3003,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n"); - #line 911 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 900 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 911 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 900 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.Device != null) { @@ -3092,13 +3023,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\""); WriteLiteral(">\r\n"); - #line 914 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 903 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 914 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 903 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceHeld()) { @@ -3106,14 +3037,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 916 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 905 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Device Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button")); #line default #line hidden - #line 916 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 905 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3123,7 +3054,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 918 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 907 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReadyForReturn()) { @@ -3131,14 +3062,14 @@ WriteLiteral(" "); #line default #line hidden - #line 920 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 909 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Device Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert")); #line default #line hidden - #line 920 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 909 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3148,7 +3079,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 922 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 911 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReturned()) { @@ -3156,14 +3087,14 @@ WriteLiteral(" "); #line default #line hidden - #line 924 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 913 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Device Returned", MVC.API.Job.DeviceReturned(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReturned_Button", Model.Job.CanDeviceReadyForReturn() ? null : "alert")); #line default #line hidden - #line 924 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 913 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3173,7 +3104,7 @@ WriteLiteral(" "); WriteLiteral(" \r\n"); - #line 927 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 916 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3182,7 +3113,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" "); - #line 928 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 917 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -3196,13 +3127,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\""); WriteLiteral(">\r\n\r\n\r\n"); - #line 933 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 922 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 933 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 922 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWaitingForUserAction()) { @@ -3230,13 +3161,13 @@ WriteLiteral(" title=\"Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 937 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 926 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 937 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 926 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true))) { @@ -3254,7 +3185,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 943 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 932 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3289,7 +3220,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 976 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 965 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3298,7 +3229,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 977 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 966 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanNotWaitingForUserAction()) { @@ -3326,13 +3257,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 981 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 970 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 981 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 970 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true))) { @@ -3350,7 +3281,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 987 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 976 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3386,7 +3317,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 1021 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1010 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3395,7 +3326,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral("\r\n \r\n"); - #line 1024 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1013 "..\..\Views\Job\JobParts\_Subject.cshtml" } diff --git a/Disco.Web/Views/User/UserParts/_Subject.cshtml b/Disco.Web/Views/User/UserParts/_Subject.cshtml index f80eef3a..3afe4079 100644 --- a/Disco.Web/Views/User/UserParts/_Subject.cshtml +++ b/Disco.Web/Views/User/UserParts/_Subject.cshtml @@ -3,7 +3,6 @@ Authorization.Require(Claims.User.Show); var currentDeviceAssignments = Model.User.DeviceUserAssignments.Where(dua => !dua.UnassignedDate.HasValue).OrderByDescending(dua => dua.AssignedDate).ToList(); - Disco.Models.Services.Plugins.Details.DetailsResult deviceDetails; } @@ -419,16 +418,6 @@ @CommonHelpers.FriendlyDate(assignment.AssignedDate) - @if (Model.AssignedDevicesDetails != null && Model.AssignedDevicesDetails.TryGetValue(assignment.DeviceSerialNumber, out deviceDetails) && deviceDetails.Details.Count > 0) - { - foreach (var detail in deviceDetails.Details) - { - - - - - } - }
    @detail.Key:@Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)
    diff --git a/Disco.Web/Views/User/UserParts/_Subject.generated.cs b/Disco.Web/Views/User/UserParts/_Subject.generated.cs index 37d49b21..ad12399e 100644 --- a/Disco.Web/Views/User/UserParts/_Subject.generated.cs +++ b/Disco.Web/Views/User/UserParts/_Subject.generated.cs @@ -49,7 +49,6 @@ namespace Disco.Web.Views.User.UserParts Authorization.Require(Claims.User.Show); var currentDeviceAssignments = Model.User.DeviceUserAssignments.Where(dua => !dua.UnassignedDate.HasValue).OrderByDescending(dua => dua.AssignedDate).ToList(); - Disco.Models.Services.Plugins.Details.DetailsResult deviceDetails; #line default @@ -62,27 +61,27 @@ WriteLiteral(">\r\n \r\n \r\n (Model.HasUserPhoto ? "hasPhoto" : "noPhoto" + #line 10 "..\..\Views\User\UserParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create(" ", 374), Tuple.Create(Model.HasUserPhoto ? "hasPhoto" : "noPhoto" #line default #line hidden -, 447), false) +, 375), false) ); WriteLiteral(">\r\n"); - #line 12 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 11 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 12 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 11 "..\..\Views\User\UserParts\_Subject.cshtml" if (Model.HasUserPhoto) { @@ -97,20 +96,20 @@ WriteLiteral(">\r\n (Url.Action(MVC.API.User.Photo(Model.User.UserId)) + #line 14 "..\..\Views\User\UserParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 615), Tuple.Create(Url.Action(MVC.API.User.Photo(Model.User.UserId)) #line default #line hidden -, 687), false) +, 615), false) ); WriteLiteral(" />\r\n \r\n"); - #line 17 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 16 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -139,7 +138,7 @@ WriteLiteral(" title=\"Username\""); WriteLiteral(">"); - #line 26 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 25 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.UserId); @@ -156,7 +155,7 @@ WriteLiteral(" title=\"Display Name\""); WriteLiteral(">"); - #line 31 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 30 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.DisplayName); @@ -173,7 +172,7 @@ WriteLiteral(" title=\"Given Name\""); WriteLiteral(">"); - #line 35 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 34 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.GivenName); @@ -190,7 +189,7 @@ WriteLiteral(" title=\"Surname\""); WriteLiteral(">"); - #line 39 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 38 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.Surname); @@ -200,13 +199,13 @@ WriteLiteral("\r\n \r\n "\r\n \r\n"); - #line 43 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 42 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 43 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 42 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowDetails)) { @@ -227,13 +226,13 @@ WriteLiteral(">\r\n \r\n "Email:\r\n \r\n"); - #line 50 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 49 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 50 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 49 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrEmpty(Model.User.EmailAddress)) { @@ -248,21 +247,21 @@ WriteLiteral(" title=\"Email Address [Update in Active Directory]\""); WriteLiteral(">(Model.User.EmailAddress + #line 51 "..\..\Views\User\UserParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 2778), Tuple.Create(Model.User.EmailAddress #line default #line hidden -, 2850), false) +, 2778), false) ); WriteLiteral(">"); - #line 52 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 51 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.EmailAddress); @@ -271,7 +270,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 53 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 52 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -286,7 +285,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 57 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 56 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -297,13 +296,13 @@ WriteLiteral(" \r\n "hone:\r\n \r\n"); - #line 63 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 62 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 63 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 62 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrEmpty(Model.User.PhoneNumber)) { @@ -318,21 +317,21 @@ WriteLiteral(" title=\"Phone Number [Update in Active Directory]\""); WriteLiteral(">(Model.User.PhoneNumber + #line 64 "..\..\Views\User\UserParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 3607), Tuple.Create(Model.User.PhoneNumber #line default #line hidden -, 3679), false) +, 3607), false) ); WriteLiteral(">"); - #line 65 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 64 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.PhoneNumber); @@ -341,7 +340,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 66 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 65 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -356,7 +355,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 70 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 69 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -366,7 +365,7 @@ WriteLiteral(" \r\n "\n \r\n \r\n"); - #line 75 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 74 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -375,7 +374,7 @@ WriteLiteral(" \r\n WriteLiteral(" "); - #line 76 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 75 "..\..\Views\User\UserParts\_Subject.cshtml" if (Model.UserDetails != null && Model.UserDetails.Details.Count(d => !d.Key.EndsWith("&")) > 0) { @@ -395,13 +394,13 @@ WriteLiteral(" class=\"none verticalHeadings\""); WriteLiteral(">\r\n"); - #line 80 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 79 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 80 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 79 "..\..\Views\User\UserParts\_Subject.cshtml" foreach (var detail in Model.UserDetails.Details.Where(d => !d.Key.EndsWith("&"))) { @@ -412,7 +411,7 @@ WriteLiteral(" \r\n " "); - #line 83 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 82 "..\..\Views\User\UserParts\_Subject.cshtml" Write(detail.Key.TrimEnd('*')); @@ -421,13 +420,13 @@ WriteLiteral(" \r\n WriteLiteral(":\r\n \r\n"); - #line 85 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 84 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 85 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 84 "..\..\Views\User\UserParts\_Subject.cshtml" if (detail.Key.EndsWith("*")) { @@ -449,7 +448,7 @@ WriteLiteral(" class=\"reveal hidden\""); WriteLiteral(">"); - #line 88 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 87 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); @@ -458,7 +457,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 89 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 88 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -467,14 +466,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 92 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 91 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); #line default #line hidden - #line 92 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 91 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -485,7 +484,7 @@ WriteLiteral(" \r\n " \r\n"); - #line 96 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 95 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -510,7 +509,7 @@ WriteLiteral(@"> "); - #line 110 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 109 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -519,7 +518,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 111 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 110 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.User.Actions.GenerateDocuments)) { @@ -537,7 +536,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 114 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 113 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._GenerateDocumentControl, Model.GenerateDocumentControlModel)); @@ -546,7 +545,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n"); - #line 116 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 115 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -559,13 +558,13 @@ WriteLiteral(" id=\"User_Show_Details_Actions\""); WriteLiteral(">\r\n"); - #line 118 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 117 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 118 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 117 "..\..\Views\User\UserParts\_Subject.cshtml" if (Model.User.CanCreateJob()) { Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob"); @@ -574,14 +573,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 121 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 120 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.UserId), "User_Show_Details_Actions_CreateJob_Button")); #line default #line hidden - #line 121 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 120 "..\..\Views\User\UserParts\_Subject.cshtml" if (currentDeviceAssignments.Count > 1) { @@ -621,13 +620,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 134 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 133 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 134 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 133 "..\..\Views\User\UserParts\_Subject.cshtml" foreach (var assignment in currentDeviceAssignments) { @@ -641,7 +640,7 @@ WriteLiteral(" class=\"CreateJob_Assignment clearfix\""); WriteLiteral(" data-createjoburl=\""); - #line 136 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 135 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Url.Action(MVC.Job.Create(assignment.DeviceSerialNumber, Model.User.UserId))); @@ -665,14 +664,14 @@ WriteLiteral(" class=\"CreateJob_Assignment_Image\""); WriteLiteral(" alt=\"Model Image\""); -WriteAttribute("src", Tuple.Create(" src=\"", 8717), Tuple.Create("\"", 8838) +WriteAttribute("src", Tuple.Create(" src=\"", 8645), Tuple.Create("\"", 8766) - #line 141 "..\..\Views\User\UserParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 8723), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) + #line 140 "..\..\Views\User\UserParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 8651), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) #line default #line hidden -, 8723), false) +, 8651), false) ); WriteLiteral(@" /> @@ -686,7 +685,7 @@ WriteLiteral(@" /> "); - #line 149 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 148 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.SerialNumber); @@ -695,7 +694,7 @@ WriteLiteral(@" /> WriteLiteral(" ("); - #line 149 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 148 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.ComputerName); @@ -712,7 +711,7 @@ WriteLiteral(@") "); - #line 157 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 156 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.DeviceModel.ToString()); @@ -727,13 +726,13 @@ WriteLiteral(@" "); - #line 163 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 162 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 163 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 162 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) { @@ -743,7 +742,7 @@ WriteLiteral(@" WriteLiteral(" "); - #line 165 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 164 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.AssetNumber); @@ -752,7 +751,7 @@ WriteLiteral(" WriteLiteral("\r\n"); - #line 166 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 165 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -767,7 +766,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 170 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 169 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -781,7 +780,7 @@ WriteLiteral(@" < "); - #line 176 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 175 "..\..\Views\User\UserParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDate(assignment.AssignedDate)); @@ -796,7 +795,7 @@ WriteLiteral(@" "); - #line 182 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 181 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -834,7 +833,7 @@ WriteLiteral(" \r\n"); - #line 222 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 221 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -857,7 +856,7 @@ WriteLiteral(@" \r\n"); - #line 328 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 327 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1107,13 +1106,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n \r\n \r\n"); - #line 332 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 331 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 332 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 331 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowAssignments)) { @@ -1131,13 +1130,13 @@ WriteLiteral(" id=\"User_Show_AssignedDevices_Active\""); WriteLiteral(">\r\n

    Current Device Assignments

    \r\n"); - #line 338 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 337 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 338 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 337 "..\..\Views\User\UserParts\_Subject.cshtml" if (currentDeviceAssignments.Count > 0) { foreach (var assignment in currentDeviceAssignments) @@ -1153,7 +1152,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment clearfix\""); WriteLiteral(" data-deviceserialnumber=\""); - #line 342 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 341 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.DeviceSerialNumber); @@ -1164,13 +1163,13 @@ WriteLiteral("\""); WriteLiteral(">\r\n"); - #line 343 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 342 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 343 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 342 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.Device.Show)) { @@ -1179,14 +1178,14 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (Url.Action(MVC.Device.Show(assignment.Device.SerialNumber)) + #line 344 "..\..\Views\User\UserParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 21703), Tuple.Create(Url.Action(MVC.Device.Show(assignment.Device.SerialNumber)) #line default #line hidden -, 21775), false) +, 21703), false) ); WriteLiteral(">\r\n (Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) + #line 345 "..\..\Views\User\UserParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 21901), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) #line default #line hidden -, 21973), false) +, 21901), false) ); WriteLiteral(" />\r\n \r\n"); - #line 348 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 347 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -1222,20 +1221,20 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Image\""); WriteLiteral(" alt=\"Model Image\""); -WriteAttribute("src", Tuple.Create(" src=\"", 22400), Tuple.Create("\"", 22521) +WriteAttribute("src", Tuple.Create(" src=\"", 22328), Tuple.Create("\"", 22449) - #line 351 "..\..\Views\User\UserParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 22406), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) + #line 350 "..\..\Views\User\UserParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 22334), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) #line default #line hidden -, 22406), false) +, 22334), false) ); WriteLiteral(" />\r\n"); - #line 352 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 351 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1263,13 +1262,13 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_SerialNumber\ WriteLiteral(">\r\n"); - #line 362 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 361 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 362 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 361 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.Device.Show)) { @@ -1277,14 +1276,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 364 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 363 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber))); #line default #line hidden - #line 364 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 363 "..\..\Views\User\UserParts\_Subject.cshtml" } else @@ -1294,14 +1293,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 368 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 367 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.SerialNumber); #line default #line hidden - #line 368 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 367 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1311,13 +1310,13 @@ WriteLiteral(">\r\n"); WriteLiteral(" \r\n"); - #line 371 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 370 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 371 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 370 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrWhiteSpace(assignment.Device.ComputerName)) { @@ -1333,7 +1332,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_ComputerName\ WriteLiteral(">"); - #line 373 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 372 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.ComputerName); @@ -1344,7 +1343,7 @@ WriteLiteral(")"); WriteLiteral("\r\n"); - #line 374 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 373 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1354,13 +1353,13 @@ WriteLiteral(" \r\n " \r\n"); - #line 377 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 376 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 377 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 376 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) { @@ -1377,7 +1376,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Asset\""); WriteLiteral(">"); - #line 382 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 381 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.AssetNumber); @@ -1387,7 +1386,7 @@ WriteLiteral("\r\n " \r\n"); - #line 385 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 384 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1396,7 +1395,7 @@ WriteLiteral("\r\n WriteLiteral(" "); - #line 386 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 385 "..\..\Views\User\UserParts\_Subject.cshtml" if (assignment.Device.DeviceModelId.HasValue) { @@ -1415,7 +1414,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Model\""); WriteLiteral(">"); - #line 393 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 392 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.DeviceModel.ToString()); @@ -1425,7 +1424,7 @@ WriteLiteral("\r\n " \r\n"); - #line 396 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 395 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1443,7 +1442,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Profile\""); WriteLiteral(">"); - #line 402 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 401 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.DeviceProfile.ToString()); @@ -1453,13 +1452,13 @@ WriteLiteral("\r\n " \r\n"); - #line 405 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 404 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 405 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 404 "..\..\Views\User\UserParts\_Subject.cshtml" if (assignment.Device.DeviceBatchId.HasValue) { @@ -1478,7 +1477,7 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Batch\""); WriteLiteral(">"); - #line 412 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 411 "..\..\Views\User\UserParts\_Subject.cshtml" Write(assignment.Device.DeviceBatch.ToString()); @@ -1488,7 +1487,7 @@ WriteLiteral("\r\n " \r\n"); - #line 415 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 414 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1504,66 +1503,23 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Assigned\""); WriteLiteral(">"); - #line 419 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 418 "..\..\Views\User\UserParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDate(assignment.AssignedDate)); #line default #line hidden -WriteLiteral("\r\n \r\n " + -" \r\n"); +WriteLiteral(@" + + + + + + +"); - #line 422 "..\..\Views\User\UserParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 422 "..\..\Views\User\UserParts\_Subject.cshtml" - if (Model.AssignedDevicesDetails != null && Model.AssignedDevicesDetails.TryGetValue(assignment.DeviceSerialNumber, out deviceDetails) && deviceDetails.Details.Count > 0) - { - foreach (var detail in deviceDetails.Details) - { - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" "); - - - #line 427 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(detail.Key); - - - #line default - #line hidden -WriteLiteral(":\r\n "); - - - #line 428 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n"); - - - #line 430 "..\..\Views\User\UserParts\_Subject.cshtml" - } - } - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" \r\n \r\n " + -" \r\n"); - - - #line 436 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 425 "..\..\Views\User\UserParts\_Subject.cshtml" } } else @@ -1579,7 +1535,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Current Device Assignments\r\n"); - #line 441 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 430 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1589,7 +1545,7 @@ WriteLiteral(" \r\n \r\n "\r\n"); - #line 445 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 434 "..\..\Views\User\UserParts\_Subject.cshtml" }