diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs index 098b4dc..e54cbd8 100644 --- a/Helper/StaticHelper.cs +++ b/Helper/StaticHelper.cs @@ -182,11 +182,20 @@ namespace CarCareTracker.Helper { return templateExtraFields; } - //append the fields. + var recordFieldNames = recordExtraFields.Select(x => x.Name); + //update isrequired setting foreach (ExtraField extraField in recordExtraFields) { extraField.IsRequired = templateExtraFields.Where(x => x.Name == extraField.Name).First().IsRequired; } + //append extra fields + foreach(ExtraField extraField in templateExtraFields) + { + if (!recordFieldNames.Contains(extraField.Name)) + { + recordExtraFields.Add(extraField); + } + } return recordExtraFields; } diff --git a/Views/Vehicle/_ServiceRecords.cshtml b/Views/Vehicle/_ServiceRecords.cshtml index 84e22a6..72f18b4 100644 --- a/Views/Vehicle/_ServiceRecords.cshtml +++ b/Views/Vehicle/_ServiceRecords.cshtml @@ -7,7 +7,7 @@ var hideZero = userConfig.HideZero; var userLanguage = userConfig.UserLanguage; var recordTags = Model.SelectMany(x => x.Tags).Distinct(); - var extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name); + var extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct(); } @model List