diff --git a/Disco.BI/BI/Extensions/JobExtensions.cs b/Disco.BI/BI/Extensions/JobExtensions.cs index 5101ddc1..478b4e25 100644 --- a/Disco.BI/BI/Extensions/JobExtensions.cs +++ b/Disco.BI/BI/Extensions/JobExtensions.cs @@ -1,303 +1,303 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Disco.Models.Repository; -using Disco.Data.Repository; -using System.IO; -using Disco.Models.BI.DocumentTemplates; -using Disco.Services.Plugins; -using Disco.Models.BI.Job; - -namespace Disco.BI.Extensions -{ - public static class JobExtensions - { - - public static void BroadcastUpdate(this Job j) - { - if (j.UserId != null) - Interop.SignalRHandlers.UserHeldDevices.UserJobUpdated(j.UserId); - } - - public static JobAttachment CreateAttachment(this Job Job, DiscoDataContext dbContext, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null) - { - if (string.IsNullOrEmpty(MimeType) || MimeType.Equals("unknown/unknown", StringComparison.InvariantCultureIgnoreCase)) - MimeType = Interop.MimeTypes.ResolveMimeType(Filename); - - JobAttachment ja = new JobAttachment() - { - JobId = Job.Id, - TechUserId = CreatorUser.Id, - Filename = Filename, - MimeType = MimeType, - Timestamp = DateTime.Now, - Comments = Comments - }; - - if (DocumentTemplate != null) - ja.DocumentTemplateId = DocumentTemplate.Id; - - dbContext.JobAttachments.Add(ja); - dbContext.SaveChanges(); - - ja.SaveAttachment(dbContext, Content); - Content.Position = 0; - if (PdfThumbnail == null) - ja.GenerateThumbnail(dbContext, Content); - else - ja.SaveThumbnailAttachment(dbContext, PdfThumbnail); - - return ja; - } - - public static Tuple Status(this Job j) - { - var statusId = j.CalculateStatusId(); - return new Tuple(statusId, JobBI.Utilities.JobStatusDescription(statusId, j)); - } - - public static JobTableModel.JobTableItemModelIncludeStatus ToJobTableItemModelIncludeStatus(this Job j) - { - var i = new JobTableModel.JobTableItemModelIncludeStatus() - { - Id = j.Id, - OpenedDate = j.OpenedDate, - ClosedDate = j.ClosedDate, - TypeId = j.JobTypeId, - TypeDescription = j.JobType.Description, - Location = j.DeviceHeldLocation, - - WaitingForUserAction = j.WaitingForUserAction, - DeviceReadyForReturn = j.DeviceReadyForReturn, - DeviceHeld = j.DeviceHeld, - DeviceReturnedDate = j.DeviceReturnedDate - }; - - if (j.Device != null) - { - i.DeviceSerialNumber = j.DeviceSerialNumber; - i.DeviceModelDescription = j.Device.DeviceModel.Description; - i.DeviceAddressId = j.Device.DeviceProfile.DefaultOrganisationAddress; - - if (j.JobMetaWarranty != null) - { - i.JobMetaWarranty_ExternalReference = j.JobMetaWarranty.ExternalReference; - i.JobMetaWarranty_ExternalCompletedDate = j.JobMetaWarranty.ExternalCompletedDate; - i.JobMetaWarranty_ExternalName = j.JobMetaWarranty.ExternalName; - } - if (j.JobMetaNonWarranty != null) - { - i.JobMetaNonWarranty_RepairerLoggedDate = j.JobMetaNonWarranty.RepairerLoggedDate; - i.JobMetaNonWarranty_RepairerCompletedDate = j.JobMetaNonWarranty.RepairerCompletedDate; - i.JobMetaNonWarranty_AccountingChargeAddedDate = j.JobMetaNonWarranty.AccountingChargeAddedDate; - i.JobMetaNonWarranty_AccountingChargePaidDate = j.JobMetaNonWarranty.AccountingChargePaidDate; - i.JobMetaNonWarranty_AccountingChargeRequiredDate = j.JobMetaNonWarranty.AccountingChargeRequiredDate; - i.JobMetaNonWarranty_IsInsuranceClaim = j.JobMetaNonWarranty.IsInsuranceClaim; - i.JobMetaNonWarranty_RepairerName = j.JobMetaNonWarranty.RepairerName; - if (j.JobMetaInsurance != null) - { - i.JobMetaInsurance_ClaimFormSentDate = j.JobMetaInsurance.ClaimFormSentDate; - } - } - - } - if (j.User != null) - { - i.UserId = j.UserId; - i.UserDisplayName = j.User.DisplayName; - } - if (j.OpenedTechUser != null) - { - i.OpenedTechUserId = j.OpenedTechUserId; - i.OpenedTechUserDisplayName = j.OpenedTechUser.DisplayName; - } - - return i; - } - - public static string CalculateStatusId(this Job j) - { - return j.ToJobTableItemModelIncludeStatus().CalculateStatusId(); - } - - public static string CalculateStatusId(this JobTableModel.JobTableItemModelIncludeStatus j) - { - if (j.ClosedDate.HasValue) - return Job.JobStatusIds.Closed; - - if (j.TypeId == JobType.JobTypeIds.HWar) - { - if (!string.IsNullOrEmpty(j.JobMetaWarranty_ExternalReference) && !j.JobMetaWarranty_ExternalCompletedDate.HasValue) - return Job.JobStatusIds.AwaitingWarrantyRepair; // Job Logged - but not marked as completed - } - - if (j.TypeId == JobType.JobTypeIds.HNWar) - { - if (j.JobMetaNonWarranty_RepairerLoggedDate.HasValue && !j.JobMetaNonWarranty_RepairerCompletedDate.HasValue) - return Job.JobStatusIds.AwaitingRepairs; // Repairs logged - but not complete - if (j.JobMetaNonWarranty_AccountingChargeAddedDate.HasValue && !j.JobMetaNonWarranty_AccountingChargePaidDate.HasValue) - return Job.JobStatusIds.AwaitingAccountingPayment; // Accounting Charge Added, but not paid - if (j.JobMetaNonWarranty_AccountingChargeRequiredDate.HasValue && (!j.JobMetaNonWarranty_AccountingChargePaidDate.HasValue || !j.JobMetaNonWarranty_AccountingChargeAddedDate.HasValue)) - return Job.JobStatusIds.AwaitingAccountingCharge; // Accounting Charge Required, but not added or paid - if (j.JobMetaNonWarranty_RepairerLoggedDate.HasValue && j.JobMetaNonWarranty_IsInsuranceClaim.Value && !j.JobMetaInsurance_ClaimFormSentDate.HasValue) - return Job.JobStatusIds.AwaitingInsuranceProcessing; // Is insurance claim, but no Claim Form Sent - } - - if (j.WaitingForUserAction.HasValue) - return Job.JobStatusIds.AwaitingUserAction; // Awaiting for User - - if (j.DeviceReadyForReturn.HasValue && !j.DeviceReturnedDate.HasValue) - return Job.JobStatusIds.AwaitingDeviceReturn; // Device not returned to User - - return Job.JobStatusIds.Open; - } - - public static List AvailableDocumentTemplates(this Job j, DiscoDataContext dbContext, User User, DateTime TimeStamp) - { - var dts = dbContext.DocumentTemplates.Include("JobSubTypes") - .Where(dt => dt.Scope == DocumentTemplate.DocumentTemplateScopes.Job) - .ToList(); - - foreach (var dt in dts.ToArray()) - { - if (dt.JobSubTypes.Count != 0) - { // Filter Applied - bool match = false; - foreach (var st in j.JobSubTypes) - { - if (dt.JobSubTypes.Contains(st)) - { - match = true; - break; - } - } - if (!match) - dts.Remove(dt); - } - } - - // Evaluate Filters - dts = dts.Where(dt => dt.FilterExpressionMatches(j, dbContext, User, TimeStamp, DocumentState.DefaultState())).ToList(); - - return dts; - } - - public static DateTime ValidateDateAfterOpened(this Job j, DateTime d) - { - if (d < j.OpenedDate) - { - if (d > j.OpenedDate.AddMinutes(-1)) - return j.OpenedDate; - else - throw new ArgumentException("The Date must be >= the Open Date.", "d"); - } - return d; - } - - public static string GenerateFaultDescription(this Job j, DiscoDataContext dbContext) - { - StringBuilder sb = new StringBuilder(); - - sb.AppendLine("Faulty Components:"); - foreach (var jst in j.JobSubTypes) - sb.Append("- ").AppendLine(jst.Description).AppendLine(" - "); - - return sb.ToString(); - } - - public static string GenerateFaultDescriptionFooter(this Job j, DiscoDataContext dbContext, PluginFeatureManifest WarrantyProviderDefinition) - { - var versionDisco = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; - return string.Format("Automation by Disco v{0}.{1:0000}.{2:0000} (Provider: {3} v{4})", - versionDisco.Major, versionDisco.Minor, versionDisco.Build, WarrantyProviderDefinition.Id, WarrantyProviderDefinition.PluginManifest.Version.ToString(3)); - } - - public static void UpdateSubTypes(this Job j, DiscoDataContext dbContext, List SubTypes, bool AddComponents, User TechUser) - { - if (SubTypes == null || SubTypes.Count == 0) - throw new ArgumentException("The Job must contain at least one Sub Type"); - - List addedSubTypes = new List(); - List removedSubTypes = new List(); - - // Removed Sub Types - foreach (var t in j.JobSubTypes.ToArray()) - if (!SubTypes.Contains(t)) - { - removedSubTypes.Add(t); - j.JobSubTypes.Remove(t); - } - // Added Sub Types - foreach (var t in SubTypes) - if (!j.JobSubTypes.Contains(t)) - { - addedSubTypes.Add(t); - j.JobSubTypes.Add(t); - } - - // Write Log - if (addedSubTypes.Count > 0 || removedSubTypes.Count > 0) - { - StringBuilder logBuilder = new StringBuilder(); - logBuilder.AppendLine("Updated Job Sub Types"); - if (removedSubTypes.Count > 0) - { - logBuilder.AppendLine("Removed:"); - foreach (var t in removedSubTypes) - logBuilder.Append("- ").AppendLine(t.ToString()); - } - if (addedSubTypes.Count > 0) - { - logBuilder.AppendLine("Added:"); - foreach (var t in addedSubTypes) - logBuilder.Append("- ").AppendLine(t.ToString()); - } - dbContext.JobLogs.Add(new JobLog() - { - JobId = j.Id, - TechUserId = TechUser.Id, - Timestamp = DateTime.Now, - Comments = logBuilder.ToString() - }); - } - - // Add Components - if (AddComponents && addedSubTypes.Count > 0 && j.DeviceSerialNumber != null) - { - var components = dbContext.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId); - var addedComponents = new List(); - foreach (var c in components) - { - foreach (var st in c.JobSubTypes) - { - foreach (var jst in addedSubTypes) - { - if (st.JobTypeId == jst.JobTypeId && st.Id == jst.Id) - { - addedComponents.Add(c); - break; - } - } - if (addedComponents.Contains(c)) - break; - } - } - foreach (var c in addedComponents) - { - if (!j.JobComponents.Any(jc => jc.Description.Equals(c.Description, StringComparison.InvariantCultureIgnoreCase))) - { // Job Component with matching Description doesn't exist. - dbContext.JobComponents.Add(new JobComponent() - { - Job = j, - TechUserId = TechUser.Id, - Cost = c.Cost, - Description = c.Description - }); - } - } - } - } - - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Disco.Models.Repository; +using Disco.Data.Repository; +using System.IO; +using Disco.Models.BI.DocumentTemplates; +using Disco.Services.Plugins; +using Disco.Models.BI.Job; + +namespace Disco.BI.Extensions +{ + public static class JobExtensions + { + + public static void BroadcastUpdate(this Job j) + { + if (j.UserId != null) + Interop.SignalRHandlers.UserHeldDevices.UserJobUpdated(j.UserId); + } + + public static JobAttachment CreateAttachment(this Job Job, DiscoDataContext dbContext, User CreatorUser, string Filename, string MimeType, string Comments, Stream Content, DocumentTemplate DocumentTemplate = null, byte[] PdfThumbnail = null) + { + if (string.IsNullOrEmpty(MimeType) || MimeType.Equals("unknown/unknown", StringComparison.InvariantCultureIgnoreCase)) + MimeType = Interop.MimeTypes.ResolveMimeType(Filename); + + JobAttachment ja = new JobAttachment() + { + JobId = Job.Id, + TechUserId = CreatorUser.Id, + Filename = Filename, + MimeType = MimeType, + Timestamp = DateTime.Now, + Comments = Comments + }; + + if (DocumentTemplate != null) + ja.DocumentTemplateId = DocumentTemplate.Id; + + dbContext.JobAttachments.Add(ja); + dbContext.SaveChanges(); + + ja.SaveAttachment(dbContext, Content); + Content.Position = 0; + if (PdfThumbnail == null) + ja.GenerateThumbnail(dbContext, Content); + else + ja.SaveThumbnailAttachment(dbContext, PdfThumbnail); + + return ja; + } + + public static Tuple Status(this Job j) + { + var statusId = j.CalculateStatusId(); + return new Tuple(statusId, JobBI.Utilities.JobStatusDescription(statusId, j)); + } + + public static JobTableModel.JobTableItemModelIncludeStatus ToJobTableItemModelIncludeStatus(this Job j) + { + var i = new JobTableModel.JobTableItemModelIncludeStatus() + { + Id = j.Id, + OpenedDate = j.OpenedDate, + ClosedDate = j.ClosedDate, + TypeId = j.JobTypeId, + TypeDescription = j.JobType.Description, + Location = j.DeviceHeldLocation, + + WaitingForUserAction = j.WaitingForUserAction, + DeviceReadyForReturn = j.DeviceReadyForReturn, + DeviceHeld = j.DeviceHeld, + DeviceReturnedDate = j.DeviceReturnedDate + }; + + if (j.Device != null) + { + i.DeviceSerialNumber = j.DeviceSerialNumber; + i.DeviceModelDescription = j.Device.DeviceModel.Description; + i.DeviceAddressId = j.Device.DeviceProfile.DefaultOrganisationAddress; + + if (j.JobMetaWarranty != null) + { + i.JobMetaWarranty_ExternalReference = j.JobMetaWarranty.ExternalReference; + i.JobMetaWarranty_ExternalCompletedDate = j.JobMetaWarranty.ExternalCompletedDate; + i.JobMetaWarranty_ExternalName = j.JobMetaWarranty.ExternalName; + } + if (j.JobMetaNonWarranty != null) + { + i.JobMetaNonWarranty_RepairerLoggedDate = j.JobMetaNonWarranty.RepairerLoggedDate; + i.JobMetaNonWarranty_RepairerCompletedDate = j.JobMetaNonWarranty.RepairerCompletedDate; + i.JobMetaNonWarranty_AccountingChargeAddedDate = j.JobMetaNonWarranty.AccountingChargeAddedDate; + i.JobMetaNonWarranty_AccountingChargePaidDate = j.JobMetaNonWarranty.AccountingChargePaidDate; + i.JobMetaNonWarranty_AccountingChargeRequiredDate = j.JobMetaNonWarranty.AccountingChargeRequiredDate; + i.JobMetaNonWarranty_IsInsuranceClaim = j.JobMetaNonWarranty.IsInsuranceClaim; + i.JobMetaNonWarranty_RepairerName = j.JobMetaNonWarranty.RepairerName; + if (j.JobMetaInsurance != null) + { + i.JobMetaInsurance_ClaimFormSentDate = j.JobMetaInsurance.ClaimFormSentDate; + } + } + + } + if (j.User != null) + { + i.UserId = j.UserId; + i.UserDisplayName = j.User.DisplayName; + } + if (j.OpenedTechUser != null) + { + i.OpenedTechUserId = j.OpenedTechUserId; + i.OpenedTechUserDisplayName = j.OpenedTechUser.DisplayName; + } + + return i; + } + + public static string CalculateStatusId(this Job j) + { + return j.ToJobTableItemModelIncludeStatus().CalculateStatusId(); + } + + public static string CalculateStatusId(this JobTableModel.JobTableItemModelIncludeStatus j) + { + if (j.ClosedDate.HasValue) + return Job.JobStatusIds.Closed; + + if (j.TypeId == JobType.JobTypeIds.HWar) + { + if (!string.IsNullOrEmpty(j.JobMetaWarranty_ExternalReference) && !j.JobMetaWarranty_ExternalCompletedDate.HasValue) + return Job.JobStatusIds.AwaitingWarrantyRepair; // Job Logged - but not marked as completed + } + + if (j.TypeId == JobType.JobTypeIds.HNWar) + { + if (j.JobMetaNonWarranty_RepairerLoggedDate.HasValue && !j.JobMetaNonWarranty_RepairerCompletedDate.HasValue) + return Job.JobStatusIds.AwaitingRepairs; // Repairs logged - but not complete + if (j.JobMetaNonWarranty_AccountingChargeAddedDate.HasValue && !j.JobMetaNonWarranty_AccountingChargePaidDate.HasValue) + return Job.JobStatusIds.AwaitingAccountingPayment; // Accounting Charge Added, but not paid + if (j.JobMetaNonWarranty_AccountingChargeRequiredDate.HasValue && (!j.JobMetaNonWarranty_AccountingChargePaidDate.HasValue || !j.JobMetaNonWarranty_AccountingChargeAddedDate.HasValue)) + return Job.JobStatusIds.AwaitingAccountingCharge; // Accounting Charge Required, but not added or paid + if (j.JobMetaNonWarranty_RepairerLoggedDate.HasValue && j.JobMetaNonWarranty_IsInsuranceClaim.Value && !j.JobMetaInsurance_ClaimFormSentDate.HasValue) + return Job.JobStatusIds.AwaitingInsuranceProcessing; // Is insurance claim, but no Claim Form Sent + } + + if (j.WaitingForUserAction.HasValue) + return Job.JobStatusIds.AwaitingUserAction; // Awaiting for User + + if (j.DeviceReadyForReturn.HasValue && !j.DeviceReturnedDate.HasValue) + return Job.JobStatusIds.AwaitingDeviceReturn; // Device not returned to User + + return Job.JobStatusIds.Open; + } + + public static List AvailableDocumentTemplates(this Job j, DiscoDataContext dbContext, User User, DateTime TimeStamp) + { + var dts = dbContext.DocumentTemplates.Include("JobSubTypes") + .Where(dt => dt.Scope == DocumentTemplate.DocumentTemplateScopes.Job) + .ToList(); + + foreach (var dt in dts.ToArray()) + { + if (dt.JobSubTypes.Count != 0) + { // Filter Applied + bool match = false; + foreach (var st in j.JobSubTypes) + { + if (dt.JobSubTypes.Contains(st)) + { + match = true; + break; + } + } + if (!match) + dts.Remove(dt); + } + } + + // Evaluate Filters + dts = dts.Where(dt => dt.FilterExpressionMatches(j, dbContext, User, TimeStamp, DocumentState.DefaultState())).ToList(); + + return dts; + } + + public static DateTime ValidateDateAfterOpened(this Job j, DateTime d) + { + if (d < j.OpenedDate) + { + if (d > j.OpenedDate.AddMinutes(-1)) + return j.OpenedDate; + else + throw new ArgumentException("The Date must be >= the Open Date.", "d"); + } + return d; + } + + public static string GenerateFaultDescription(this Job j, DiscoDataContext dbContext) + { + StringBuilder sb = new StringBuilder(); + + sb.AppendLine("Faulty Components:"); + foreach (var jst in j.JobSubTypes) + sb.Append("- ").AppendLine(jst.Description).AppendLine(" - "); + + return sb.ToString(); + } + + public static string GenerateFaultDescriptionFooter(this Job j, DiscoDataContext dbContext, PluginFeatureManifest WarrantyProviderDefinition) + { + var versionDisco = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + return string.Format("Automation by Disco v{0}.{1}.{2:0000}.{3:0000} (Provider: {4} v{5})", + versionDisco.Major, versionDisco.Minor, versionDisco.Build, versionDisco.Revision, WarrantyProviderDefinition.Id, WarrantyProviderDefinition.PluginManifest.Version.ToString(4)); + } + + public static void UpdateSubTypes(this Job j, DiscoDataContext dbContext, List SubTypes, bool AddComponents, User TechUser) + { + if (SubTypes == null || SubTypes.Count == 0) + throw new ArgumentException("The Job must contain at least one Sub Type"); + + List addedSubTypes = new List(); + List removedSubTypes = new List(); + + // Removed Sub Types + foreach (var t in j.JobSubTypes.ToArray()) + if (!SubTypes.Contains(t)) + { + removedSubTypes.Add(t); + j.JobSubTypes.Remove(t); + } + // Added Sub Types + foreach (var t in SubTypes) + if (!j.JobSubTypes.Contains(t)) + { + addedSubTypes.Add(t); + j.JobSubTypes.Add(t); + } + + // Write Log + if (addedSubTypes.Count > 0 || removedSubTypes.Count > 0) + { + StringBuilder logBuilder = new StringBuilder(); + logBuilder.AppendLine("Updated Job Sub Types"); + if (removedSubTypes.Count > 0) + { + logBuilder.AppendLine("Removed:"); + foreach (var t in removedSubTypes) + logBuilder.Append("- ").AppendLine(t.ToString()); + } + if (addedSubTypes.Count > 0) + { + logBuilder.AppendLine("Added:"); + foreach (var t in addedSubTypes) + logBuilder.Append("- ").AppendLine(t.ToString()); + } + dbContext.JobLogs.Add(new JobLog() + { + JobId = j.Id, + TechUserId = TechUser.Id, + Timestamp = DateTime.Now, + Comments = logBuilder.ToString() + }); + } + + // Add Components + if (AddComponents && addedSubTypes.Count > 0 && j.DeviceSerialNumber != null) + { + var components = dbContext.DeviceComponents.Include("JobSubTypes").Where(c => !c.DeviceModelId.HasValue || c.DeviceModelId == j.Device.DeviceModelId); + var addedComponents = new List(); + foreach (var c in components) + { + foreach (var st in c.JobSubTypes) + { + foreach (var jst in addedSubTypes) + { + if (st.JobTypeId == jst.JobTypeId && st.Id == jst.Id) + { + addedComponents.Add(c); + break; + } + } + if (addedComponents.Contains(c)) + break; + } + } + foreach (var c in addedComponents) + { + if (!j.JobComponents.Any(jc => jc.Description.Equals(c.Description, StringComparison.InvariantCultureIgnoreCase))) + { // Job Component with matching Description doesn't exist. + dbContext.JobComponents.Add(new JobComponent() + { + Job = j, + TechUserId = TechUser.Id, + Cost = c.Cost, + Description = c.Description + }); + } + } + } + } + + } +} diff --git a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs index 32ac0fd8..1c5c9e4e 100644 --- a/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs +++ b/Disco.BI/BI/Interop/ActiveDirectory/ActiveDirectoryUpdateLastNetworkLogonDateJob.cs @@ -245,6 +245,9 @@ namespace Disco.BI.Interop.ActiveDirectory { if (d.LastNetworkLogonDate.HasValue) { + // Change accuracy to the second + computerLastLogonDate = new DateTime((computerLastLogonDate.Ticks / 10000000L) * 10000000L); + if (System.DateTime.Compare(d.LastNetworkLogonDate.Value, computerLastLogonDate) < 0) { d.LastNetworkLogonDate = computerLastLogonDate; diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index dec94cdc..48b1adeb 100644 --- a/Disco.BI/Properties/AssemblyInfo.cs +++ b/Disco.BI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0219.1854")] -[assembly: AssemblyFileVersion("1.2.0219.1854")] +[assembly: AssemblyVersion("1.2.0221.1820")] +[assembly: AssemblyFileVersion("1.2.0221.1820")] diff --git a/Disco.Client/Package Creation/PreparationClient.zip b/Disco.Client/Package Creation/PreparationClient.zip index 9246c829..e9a6e11b 100644 Binary files a/Disco.Client/Package Creation/PreparationClient.zip and b/Disco.Client/Package Creation/PreparationClient.zip differ diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index c9a53cf1..5cc2cfe5 100644 --- a/Disco.Client/Properties/AssemblyInfo.cs +++ b/Disco.Client/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0219.1813")] -[assembly: AssemblyFileVersion("1.2.0219.1813")] +[assembly: AssemblyVersion("1.2.0221.1820")] +[assembly: AssemblyFileVersion("1.2.0221.1820")] diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index 0d43e443..5240b2ea 100644 --- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs +++ b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0219.1813")] -[assembly: AssemblyFileVersion("1.2.0219.1813")] +[assembly: AssemblyVersion("1.2.0221.1820")] +[assembly: AssemblyFileVersion("1.2.0221.1820")] diff --git a/Disco.Web/Global.asax.cs b/Disco.Web/Global.asax.cs index 9b836f82..4766dec1 100644 --- a/Disco.Web/Global.asax.cs +++ b/Disco.Web/Global.asax.cs @@ -171,7 +171,7 @@ namespace Disco.Web private static Lazy _Version = new Lazy(() => { var AssemblyVersion = typeof(DiscoApplication).Assembly.GetName().Version; - return string.Format("{0}.{1}.{2:0000}", AssemblyVersion.Major, AssemblyVersion.Minor, AssemblyVersion.Build); + return string.Format("{0}.{1}.{2:0000}.{3:0000}", AssemblyVersion.Major, AssemblyVersion.Minor, AssemblyVersion.Build, AssemblyVersion.Revision); }); public static string Version { diff --git a/Disco.Web/Views/Job/JobParts/Warranty.cshtml b/Disco.Web/Views/Job/JobParts/Warranty.cshtml index 2645b51e..9e4d720e 100644 --- a/Disco.Web/Views/Job/JobParts/Warranty.cshtml +++ b/Disco.Web/Views/Job/JobParts/Warranty.cshtml @@ -1,127 +1,127 @@ -@model Disco.Web.Models.Job.ShowModel -
- - - - - - - - - - - - - - - - - - - - - -
- Warranty Provider - - @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName) - @AjaxHelpers.AjaxSave() - @AjaxHelpers.AjaxLoader() - -
- Warranty Logged - - @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate) - @AjaxHelpers.AjaxLoader() - -
- Warranty Reference - - @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference) - @AjaxHelpers.AjaxSave() - @AjaxHelpers.AjaxLoader() - -
- Warranty Completed - - @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate) - @AjaxHelpers.AjaxLoader() - -
-
- +@model Disco.Web.Models.Job.ShowModel +
+ + + + + + + + + + + + + + + + + + + + + +
+ Warranty Provider + + @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName) + @AjaxHelpers.AjaxSave() + @AjaxHelpers.AjaxLoader() + +
+ Warranty Logged + + @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate) + @AjaxHelpers.AjaxLoader() + +
+ Warranty Reference + + @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference) + @AjaxHelpers.AjaxSave() + @AjaxHelpers.AjaxLoader() + +
+ Warranty Completed + + @Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate) + @AjaxHelpers.AjaxLoader() + +
+
+ diff --git a/Disco.Web/Views/Job/JobParts/Warranty.generated.cs b/Disco.Web/Views/Job/JobParts/Warranty.generated.cs index ab8c0a67..31504de8 100644 --- a/Disco.Web/Views/Job/JobParts/Warranty.generated.cs +++ b/Disco.Web/Views/Job/JobParts/Warranty.generated.cs @@ -1,341 +1,341 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17929 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Disco.Web.Views.Job.JobParts -{ - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Net; - using System.Text; - using System.Web; - using System.Web.Helpers; - using System.Web.Mvc; - using System.Web.Mvc.Ajax; - using System.Web.Mvc.Html; - using System.Web.Routing; - using System.Web.Security; - using System.Web.UI; - using System.Web.WebPages; - using Disco.BI.Extensions; - using Disco.Models.Repository; - using Disco.Web; - using Disco.Web.Extensions; - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")] - [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Warranty.cshtml")] - public class Warranty : System.Web.Mvc.WebViewPage - { - public Warranty() - { - } - public override void Execute() - { -WriteLiteral("\r\n \r\n \r\n \r\n Warranty Provider\r\n \r\n \r\n"); - -WriteLiteral(" "); - - - #line 9 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - -WriteLiteral(" "); - - - #line 10 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(AjaxHelpers.AjaxSave()); - - - #line default - #line hidden -WriteLiteral("\r\n"); - -WriteLiteral(" "); - - - #line 11 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(AjaxHelpers.AjaxLoader()); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n $(function () {\r\n document.DiscoFun" + -"ctions.PropertyChangeHelper(\r\n $(\'#Job_JobMetaWarrant" + -"y_ExternalName\'),\r\n \'Unknown\',\r\n " + -" \'"); - - - #line 17 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalName(Model.Job.Id, null))); - - - #line default - #line hidden -WriteLiteral("\',\r\n \'ExternalName\'\r\n );\r\n " + -" });\r\n \r\n \r\n \r" + -"\n \r\n \r\n Warranty Logged\r\n \r\n \r\n"); - -WriteLiteral(" "); - - - #line 29 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - -WriteLiteral(" "); - - - #line 30 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(AjaxHelpers.AjaxLoader()); - - - #line default - #line hidden -WriteLiteral("\r\n - $(function () { - var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate'); - document.DiscoFunctions.DateChangeHelper( - dateField, - 'Unknown', - '"); - - - #line 37 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null))); - - - #line default - #line hidden -WriteLiteral("\',\r\n \'ExternalLoggedDate\',\r\n null\r\n" + -" );\r\n });\r\n \r\n" + -" \r\n \r\n \r\n \r\n Warranty Reference\r\n \r\n \r\n"); - -WriteLiteral(" "); - - - #line 50 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - -WriteLiteral(" "); - - - #line 51 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(AjaxHelpers.AjaxSave()); - - - #line default - #line hidden -WriteLiteral("\r\n"); - -WriteLiteral(" "); - - - #line 52 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(AjaxHelpers.AjaxLoader()); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n $(function () {\r\n document.DiscoFun" + -"ctions.PropertyChangeHelper(\r\n $(\'#Job_JobMetaWarrant" + -"y_ExternalReference\'),\r\n \'Unknown\',\r\n " + -" \'"); - - - #line 58 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null))); - - - #line default - #line hidden -WriteLiteral("\',\r\n \'ExternalReference\'\r\n );\r\n" + -" });\r\n \r\n \r\n <" + -"/tr>\r\n \r\n \r\n Warranty Completed\r\n \r\n \r\n"); - -WriteLiteral(" "); - - - #line 70 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - -WriteLiteral(" "); - - - #line 71 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(AjaxHelpers.AjaxLoader()); - - - #line default - #line hidden -WriteLiteral("\r\n - $(function () { - var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate'); - document.DiscoFunctions.DateChangeHelper( - dateField, - 'Unknown', - '"); - - - #line 78 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null))); - - - #line default - #line hidden -WriteLiteral("\',\r\n \'ExternalCompletedDate\',\r\n nul" + -"l\r\n );\r\n });\r\n \r\n \r\n \r\n \r\n \r\n Provider Details\r\n \r\n \r\n " + -" \r\n Loading...\r\n \r\n \r\n \r\n \r\n \r\n \r\n" + -"\r\n - $('#jobDetailTabItems').append('
  • Warranty
    • '); - $(function () { - var warrantyProviderDetailLoaded = false; - - $('#jobDetailTabs').bind('tabsshow', function (e, ui) { - if ($(ui.panel).is('#jobDetailTab-Warranty')) { - if (!warrantyProviderDetailLoaded) { - var warrantyExternalName = $('#Job_JobMetaWarranty_ExternalName').val(); - if (warrantyExternalName) { - $('#jobWarrantyProviderDetailContainer').show(); - $('#jobWarrantyProviderDetailLoading span').show(); - $('#jobWarrantyProviderDetailHost').load( - '"); - - - #line 113 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Url.Action(MVC.Job.WarrantyProviderJobDetails())); - - - #line default - #line hidden -WriteLiteral("\',\r\n { id: \'"); - - - #line 114 "..\..\Views\Job\JobParts\Warranty.cshtml" - Write(Model.Job.Id); - - - #line default - #line hidden -WriteLiteral(@"' }, - function () { - $('#jobWarrantyProviderDetailLoading').hide(); - $(this).slideDown(); - } - ); - - warrantyProviderDetailLoaded = true; - } - } - } - }); - }); - -"); - - } - } -} -#pragma warning restore 1591 +#pragma warning disable 1591 +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.17929 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Disco.Web.Views.Job.JobParts +{ + using System; + using System.Collections.Generic; + using System.IO; + using System.Linq; + using System.Net; + using System.Text; + using System.Web; + using System.Web.Helpers; + using System.Web.Mvc; + using System.Web.Mvc.Ajax; + using System.Web.Mvc.Html; + using System.Web.Routing; + using System.Web.Security; + using System.Web.UI; + using System.Web.WebPages; + using Disco.BI.Extensions; + using Disco.Models.Repository; + using Disco.Web; + using Disco.Web.Extensions; + + [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")] + [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Warranty.cshtml")] + public class Warranty : System.Web.Mvc.WebViewPage + { + public Warranty() + { + } + public override void Execute() + { +WriteLiteral("\r\n \r\n \r\n \r\n Warranty Provider\r\n \r\n \r\n"); + +WriteLiteral(" "); + + + #line 9 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalName)); + + + #line default + #line hidden +WriteLiteral("\r\n"); + +WriteLiteral(" "); + + + #line 10 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(AjaxHelpers.AjaxSave()); + + + #line default + #line hidden +WriteLiteral("\r\n"); + +WriteLiteral(" "); + + + #line 11 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(AjaxHelpers.AjaxLoader()); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n $(function () {\r\n document.DiscoFun" + +"ctions.PropertyChangeHelper(\r\n $(\'#Job_JobMetaWarrant" + +"y_ExternalName\'),\r\n \'Unknown\',\r\n " + +" \'"); + + + #line 17 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalName(Model.Job.Id, null))); + + + #line default + #line hidden +WriteLiteral("\',\r\n \'ExternalName\'\r\n );\r\n " + +" });\r\n \r\n \r\n \r" + +"\n \r\n \r\n Warranty Logged\r\n \r\n \r\n"); + +WriteLiteral(" "); + + + #line 29 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate)); + + + #line default + #line hidden +WriteLiteral("\r\n"); + +WriteLiteral(" "); + + + #line 30 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(AjaxHelpers.AjaxLoader()); + + + #line default + #line hidden +WriteLiteral("\r\n + $(function () { + var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate'); + document.DiscoFunctions.DateChangeHelper( + dateField, + 'Unknown', + '"); + + + #line 37 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null))); + + + #line default + #line hidden +WriteLiteral("\',\r\n \'ExternalLoggedDate\',\r\n null\r\n" + +" );\r\n });\r\n \r\n" + +" \r\n \r\n \r\n \r\n Warranty Reference\r\n \r\n \r\n"); + +WriteLiteral(" "); + + + #line 50 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference)); + + + #line default + #line hidden +WriteLiteral("\r\n"); + +WriteLiteral(" "); + + + #line 51 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(AjaxHelpers.AjaxSave()); + + + #line default + #line hidden +WriteLiteral("\r\n"); + +WriteLiteral(" "); + + + #line 52 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(AjaxHelpers.AjaxLoader()); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n $(function () {\r\n document.DiscoFun" + +"ctions.PropertyChangeHelper(\r\n $(\'#Job_JobMetaWarrant" + +"y_ExternalReference\'),\r\n \'Unknown\',\r\n " + +" \'"); + + + #line 58 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null))); + + + #line default + #line hidden +WriteLiteral("\',\r\n \'ExternalReference\'\r\n );\r\n" + +" });\r\n \r\n \r\n <" + +"/tr>\r\n \r\n \r\n Warranty Completed\r\n \r\n \r\n"); + +WriteLiteral(" "); + + + #line 70 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate)); + + + #line default + #line hidden +WriteLiteral("\r\n"); + +WriteLiteral(" "); + + + #line 71 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(AjaxHelpers.AjaxLoader()); + + + #line default + #line hidden +WriteLiteral("\r\n + $(function () { + var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate'); + document.DiscoFunctions.DateChangeHelper( + dateField, + 'Unknown', + '"); + + + #line 78 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null))); + + + #line default + #line hidden +WriteLiteral("\',\r\n \'ExternalCompletedDate\',\r\n nul" + +"l\r\n );\r\n });\r\n \r\n \r\n \r\n \r\n \r\n Provider Details\r\n \r\n \r\n " + +" \r\n Loading...\r\n \r\n \r\n \r\n \r\n \r\n \r\n" + +"\r\n + $('#jobDetailTabItems').append('
  • Warranty
    • '); + $(function () { + var warrantyProviderDetailLoaded = false; + + $('#jobDetailTabs').on('tabsactivate', function (e, ui) { + if ($(ui.newPanel).is('#jobDetailTab-Warranty')) { + if (!warrantyProviderDetailLoaded) { + var warrantyExternalName = $('#Job_JobMetaWarranty_ExternalName').val(); + if (warrantyExternalName) { + $('#jobWarrantyProviderDetailContainer').show(); + $('#jobWarrantyProviderDetailLoading span').show(); + $('#jobWarrantyProviderDetailHost').load( + '"); + + + #line 113 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Url.Action(MVC.Job.WarrantyProviderJobDetails())); + + + #line default + #line hidden +WriteLiteral("\',\r\n { id: \'"); + + + #line 114 "..\..\Views\Job\JobParts\Warranty.cshtml" + Write(Model.Job.Id); + + + #line default + #line hidden +WriteLiteral(@"' }, + function () { + $('#jobWarrantyProviderDetailLoading').hide(); + $(this).slideDown(); + } + ); + + warrantyProviderDetailLoaded = true; + } + } + } + }); + }); + +"); + + } + } +} +#pragma warning restore 1591 diff --git a/Disco.Web/Views/Job/JobParts/_Subject.cshtml b/Disco.Web/Views/Job/JobParts/_Subject.cshtml index 49a8d33b..9e1b4181 100644 --- a/Disco.Web/Views/Job/JobParts/_Subject.cshtml +++ b/Disco.Web/Views/Job/JobParts/_Subject.cshtml @@ -178,8 +178,10 @@
    @Html.ActionLink(Model.Job.Device.DeviceBatch.Name, MVC.Config.DeviceBatch.Index(Model.Job.Device.DeviceBatchId))
    } - @if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar) + @if (Model.Job.Device.DeviceBatch != null) { + if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar) + {
    DEVICE WARRANTY
    Until: @Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown")
    @@ -206,9 +208,9 @@ }
    - } - @if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar) - { + } + if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar) + {
    INSURANCE
    @Model.Job.Device.DeviceBatch.InsuranceSupplier
    @@ -236,6 +238,7 @@ }
    + } } @if (Model.Job.DeviceHeld.HasValue) diff --git a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs index edcc1639..d1e9c1c6 100644 --- a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs +++ b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs @@ -686,8 +686,10 @@ WriteLiteral(" \r\n"); #line hidden #line 181 "..\..\Views\Job\JobParts\_Subject.cshtml" - if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar) + if (Model.Job.Device.DeviceBatch != null) { + if (Model.Job.JobTypeId == JobType.JobTypeIds.HWar) + { #line default @@ -704,7 +706,7 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HWar_ValidUntil\""); WriteLiteral(">"); - #line 185 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 187 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown")); @@ -713,13 +715,13 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 186 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 188 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 186 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 188 "..\..\Views\Job\JobParts\_Subject.cshtml" if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails)) { @@ -740,23 +742,23 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HWar_Details_Dialog\""); WriteLiteral(" class=\"dialog\""); -WriteAttribute("title", Tuple.Create(" title=\"", 12473), Tuple.Create("\"", 12538) -, Tuple.Create(Tuple.Create("", 12481), Tuple.Create("Warranty", 12481), true) -, Tuple.Create(Tuple.Create(" ", 12489), Tuple.Create("Details", 12490), true) -, Tuple.Create(Tuple.Create(" ", 12497), Tuple.Create("for", 12498), true) +WriteAttribute("title", Tuple.Create(" title=\"", 12575), Tuple.Create("\"", 12640) +, Tuple.Create(Tuple.Create("", 12583), Tuple.Create("Warranty", 12583), true) +, Tuple.Create(Tuple.Create(" ", 12591), Tuple.Create("Details", 12592), true) +, Tuple.Create(Tuple.Create(" ", 12599), Tuple.Create("for", 12600), true) - #line 189 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create(" ", 12501), Tuple.Create(Model.Job.Device.DeviceBatch.Name + #line 191 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create(" ", 12603), Tuple.Create(Model.Job.Device.DeviceBatch.Name #line default #line hidden -, 12502), false) +, 12604), false) ); WriteLiteral(">\r\n
    "); - #line 190 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 192 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(new HtmlString(Model.Job.Device.DeviceBatch.WarrantyDetails)); @@ -786,7 +788,7 @@ WriteLiteral(@"> "); - #line 207 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 209 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -795,18 +797,10 @@ WriteLiteral(@"> WriteLiteral("
    \r\n"); - #line 209 "..\..\Views\Job\JobParts\_Subject.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" "); - - - #line 210 "..\..\Views\Job\JobParts\_Subject.cshtml" - if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar) - { + #line 211 "..\..\Views\Job\JobParts\_Subject.cshtml" + } + if (Model.Job.JobTypeId == JobType.JobTypeIds.HNWar) + { #line default @@ -823,7 +817,7 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_InsuranceSupplier\""); WriteLiteral(">"); - #line 214 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 216 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.Device.DeviceBatch.InsuranceSupplier); @@ -836,7 +830,7 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_ValidUntil\""); WriteLiteral(">"); - #line 215 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 217 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.Device.DeviceBatch.InsuredUntil.ToFuzzy("Unknown")); @@ -845,13 +839,13 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 216 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 218 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 216 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 218 "..\..\Views\Job\JobParts\_Subject.cshtml" if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails)) { @@ -872,23 +866,23 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_Details_Dialog\""); WriteLiteral(" class=\"dialog\""); -WriteAttribute("title", Tuple.Create(" title=\"", 14710), Tuple.Create("\"", 14776) -, Tuple.Create(Tuple.Create("", 14718), Tuple.Create("Insurance", 14718), true) -, Tuple.Create(Tuple.Create(" ", 14727), Tuple.Create("Details", 14728), true) -, Tuple.Create(Tuple.Create(" ", 14735), Tuple.Create("for", 14736), true) +WriteAttribute("title", Tuple.Create(" title=\"", 14823), Tuple.Create("\"", 14889) +, Tuple.Create(Tuple.Create("", 14831), Tuple.Create("Insurance", 14831), true) +, Tuple.Create(Tuple.Create(" ", 14840), Tuple.Create("Details", 14841), true) +, Tuple.Create(Tuple.Create(" ", 14848), Tuple.Create("for", 14849), true) - #line 219 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create(" ", 14739), Tuple.Create(Model.Job.Device.DeviceBatch.Name + #line 221 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create(" ", 14852), Tuple.Create(Model.Job.Device.DeviceBatch.Name #line default #line hidden -, 14740), false) +, 14853), false) ); WriteLiteral(">\r\n
    "); - #line 220 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 222 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(new HtmlString(Model.Job.Device.DeviceBatch.InsuranceDetails)); @@ -918,7 +912,7 @@ WriteLiteral(@"> "); - #line 237 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 239 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -927,7 +921,8 @@ WriteLiteral(@"> WriteLiteral("
    \r\n"); - #line 239 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" + } } @@ -936,13 +931,13 @@ WriteLiteral(" \r\n"); WriteLiteral(" \r\n"); - #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 244 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 244 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceHeld.HasValue) { @@ -963,7 +958,7 @@ WriteLiteral(">\r\n \r\n "Location:\r\n "); - #line 247 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 250 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" })); @@ -972,7 +967,7 @@ WriteLiteral(">\r\n \r\n WriteLiteral(" "); - #line 247 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 250 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(AjaxHelpers.AjaxSave()); @@ -981,7 +976,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 247 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 250 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(AjaxHelpers.AjaxLoader()); @@ -996,7 +991,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceHeld\""); WriteLiteral(">"); - #line 251 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 254 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceHeld, Model.Job.DeviceHeldTechUser)); @@ -1005,13 +1000,13 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 253 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 256 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 253 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 256 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceReadyForReturn.HasValue) { @@ -1026,7 +1021,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReadyForReturn\""); WriteLiteral(">"); - #line 257 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 260 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReadyForReturn, Model.Job.DeviceReadyForReturnTechUser)); @@ -1035,7 +1030,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 259 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 262 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1044,7 +1039,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" "); - #line 260 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 263 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceReturnedDate.HasValue) { @@ -1059,7 +1054,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReturnedDate\""); WriteLiteral(">"); - #line 264 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 267 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReturnedDate, Model.Job.DeviceReturnedTechUser)); @@ -1068,7 +1063,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 266 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 269 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1102,7 +1097,7 @@ WriteLiteral(@"> url: '"); - #line 290 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 293 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))); @@ -1131,7 +1126,7 @@ WriteLiteral(@"', "); - #line 310 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 313 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1140,7 +1135,7 @@ WriteLiteral(@"', WriteLiteral(" \r\n \r\n"); - #line 313 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1149,7 +1144,7 @@ WriteLiteral(" \r\n \r\n"); WriteLiteral(" "); - #line 314 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 317 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -1169,7 +1164,7 @@ WriteLiteral(" title=\"Display Name\""); WriteLiteral(">"); - #line 318 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 321 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId))); @@ -1184,7 +1179,7 @@ WriteLiteral(" title=\"Id\""); WriteLiteral(">"); - #line 319 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 322 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.UserId); @@ -1199,7 +1194,7 @@ WriteLiteral(" title=\"Type\""); WriteLiteral(">["); - #line 319 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 322 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.Type); @@ -1208,13 +1203,13 @@ WriteLiteral(">["); WriteLiteral("]\r\n"); - #line 320 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 320 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml" if (!string.IsNullOrWhiteSpace(Model.Job.User.PhoneNumber)) { @@ -1229,7 +1224,7 @@ WriteLiteral(" title=\"Phone Number\""); WriteLiteral(">Phone: "); - #line 321 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.PhoneNumber); @@ -1238,7 +1233,7 @@ WriteLiteral(">Phone: "); WriteLiteral(""); - #line 321 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1247,7 +1242,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 322 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 325 "..\..\Views\Job\JobParts\_Subject.cshtml" if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress)) { @@ -1261,21 +1256,21 @@ WriteLiteral(" title=\"Email Address\""); WriteLiteral(">Email: (Model.Job.User.EmailAddress + #line 326 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 21821), Tuple.Create(Model.Job.User.EmailAddress #line default #line hidden -, 21677), false) +, 21821), false) ); WriteLiteral(">"); - #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 326 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.EmailAddress); @@ -1284,7 +1279,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 326 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1293,7 +1288,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 327 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.WaitingForUserAction.HasValue) { @@ -1310,7 +1305,7 @@ WriteLiteral(">\r\n

    Awaiting Action

    \r\n " Since: "); - #line 328 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 331 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.WaitingForUserAction.ToFuzzy()); @@ -1319,7 +1314,7 @@ WriteLiteral(">\r\n

    Awaiting Action

    \r\n WriteLiteral("\r\n \r\n"); - #line 330 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 333 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1328,7 +1323,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" \r\n \r\n"); - #line 333 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 336 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1345,13 +1340,13 @@ WriteLiteral(" id=\"Job_Show_Job_Actions\""); WriteLiteral(">\r\n"); - #line 337 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 340 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 337 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 340 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanClose()) { @@ -1359,14 +1354,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 339 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 342 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button")); #line default #line hidden - #line 339 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 342 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -1415,7 +1410,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n });\r\n \r\n"); - #line 377 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 380 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1424,7 +1419,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 378 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 381 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanReopen()) { @@ -1432,14 +1427,14 @@ WriteLiteral(" "); #line default #line hidden - #line 380 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 383 "..\..\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 380 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 383 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -1489,7 +1484,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 419 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 422 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1498,7 +1493,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 420 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 423 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDelete()) { @@ -1506,14 +1501,14 @@ WriteLiteral(" "); #line default #line hidden - #line 422 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 425 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Delete Job", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button")); #line default #line hidden - #line 422 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 425 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -1564,7 +1559,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 461 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 464 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1573,7 +1568,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 462 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 465 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogWarranty()) { @@ -1581,14 +1576,14 @@ WriteLiteral(" "); #line default #line hidden - #line 464 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 467 "..\..\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 464 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 467 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1598,7 +1593,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 466 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWarrantyCompleted()) { @@ -1606,14 +1601,14 @@ WriteLiteral(" "); #line default #line hidden - #line 468 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 471 "..\..\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 468 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 471 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1623,7 +1618,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 470 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 473 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanInsuranceClaimFormSent()) { @@ -1631,14 +1626,14 @@ WriteLiteral(" "); #line default #line hidden - #line 472 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 475 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Insurance Claim Form Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimFormSent_Button", "alert")); #line default #line hidden - #line 472 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 475 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1648,7 +1643,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 474 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 477 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogRepair()) { @@ -1656,14 +1651,14 @@ WriteLiteral(" "); #line default #line hidden - #line 476 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 479 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Repairs Logged", MVC.API.Job.LogRepair(Model.Job.Id, null, null, true), "Job_Show_Job_Actions_LogRepair_Button")); #line default #line hidden - #line 476 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 479 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -1680,13 +1675,13 @@ WriteLiteral(" title=\"Repairs Logged\""); WriteLiteral(">\r\n"); - #line 478 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 478 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.LogRepair(Model.Job.Id, null, null, true))) { @@ -1718,7 +1713,7 @@ WriteLiteral(" name=\"RepairerReference\""); WriteLiteral(" />\r\n

    \r\n"); - #line 488 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 491 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1756,7 +1751,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n });\r\n \r\n"); - #line 526 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 529 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1765,7 +1760,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 527 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 530 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanRepairComplete()) { @@ -1773,14 +1768,14 @@ WriteLiteral(" "); #line default #line hidden - #line 529 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 532 "..\..\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 529 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 532 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1790,7 +1785,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 531 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 534 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanConvertHWarToHNWar()) { @@ -1798,14 +1793,14 @@ WriteLiteral(" "); #line default #line hidden - #line 533 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 536 "..\..\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 533 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 536 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -1856,7 +1851,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n });\r\n \r\n"); - #line 574 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 577 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1865,13 +1860,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n"); - #line 576 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 579 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 576 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 579 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.Device != null) { @@ -1885,13 +1880,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\""); WriteLiteral(">\r\n"); - #line 579 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 582 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 579 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 582 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceHeld()) { @@ -1899,14 +1894,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 581 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 584 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button")); #line default #line hidden - #line 581 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 584 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1916,7 +1911,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 583 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 586 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReadyForReturn()) { @@ -1924,14 +1919,14 @@ WriteLiteral(" "); #line default #line hidden - #line 585 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 588 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert")); #line default #line hidden - #line 585 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 588 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1941,7 +1936,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 587 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 590 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReturned()) { @@ -1949,14 +1944,14 @@ WriteLiteral(" "); #line default #line hidden - #line 589 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 592 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("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 589 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 592 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1966,7 +1961,7 @@ WriteLiteral(" "); WriteLiteral(" \r\n"); - #line 592 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 595 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1975,7 +1970,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" "); - #line 593 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 596 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -1989,13 +1984,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\""); WriteLiteral(">\r\n\r\n\r\n"); - #line 598 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 601 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 598 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 601 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWaitingForUserAction()) { @@ -2023,13 +2018,13 @@ WriteLiteral(" title=\"Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 602 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 605 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 602 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 605 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true))) { @@ -2047,7 +2042,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 608 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 611 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2082,7 +2077,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 641 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 644 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2091,7 +2086,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 642 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 645 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanNotWaitingForUserAction()) { @@ -2119,13 +2114,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 646 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 649 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 646 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 649 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true))) { @@ -2143,7 +2138,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 652 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 655 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2179,7 +2174,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 686 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 689 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2188,7 +2183,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral("\r\n \r\n"); - #line 689 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 692 "..\..\Views\Job\JobParts\_Subject.cshtml" }