more stuff

This commit is contained in:
DESKTOP-GENO133\IvanPlex 2024-02-29 10:18:56 -07:00
parent ed3749eaf2
commit ca09d2ca66
2 changed files with 11 additions and 2 deletions

View File

@ -182,11 +182,20 @@ namespace CarCareTracker.Helper
{ {
return templateExtraFields; return templateExtraFields;
} }
//append the fields. var recordFieldNames = recordExtraFields.Select(x => x.Name);
//update isrequired setting
foreach (ExtraField extraField in recordExtraFields) foreach (ExtraField extraField in recordExtraFields)
{ {
extraField.IsRequired = templateExtraFields.Where(x => x.Name == extraField.Name).First().IsRequired; 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; return recordExtraFields;
} }

View File

@ -7,7 +7,7 @@
var hideZero = userConfig.HideZero; var hideZero = userConfig.HideZero;
var userLanguage = userConfig.UserLanguage; var userLanguage = userConfig.UserLanguage;
var recordTags = Model.SelectMany(x => x.Tags).Distinct(); 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<ServiceRecord> @model List<ServiceRecord>
<div class="row"> <div class="row">