From ca09d2ca66d91315002bc7db63863e5c1fbf1d5a Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Thu, 29 Feb 2024 10:18:56 -0700
Subject: [PATCH] more stuff

---
 Helper/StaticHelper.cs               | 11 ++++++++++-
 Views/Vehicle/_ServiceRecords.cshtml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

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<ServiceRecord>
 <div class="row">