From 4a2e02afc8066151924c629543eb921db6f0118b Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Mon, 12 Feb 2024 18:30:03 -0700
Subject: [PATCH] fixed bug where required fields don't persist.

---
 Controllers/VehicleController.cs | 12 ++++++++----
 wwwroot/js/shared.js             |  5 +++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index 5971fea..c45e55d 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -1710,7 +1710,8 @@ namespace CarCareTracker.Controllers
                         Date = DateTime.Now,
                         VehicleId = existingRecord.VehicleId,
                         Mileage = odometer,
-                        Notes = $"Auto Insert From Plan Record: {existingRecord.Description}"
+                        Notes = $"Auto Insert From Plan Record: {existingRecord.Description}",
+                        ExtraFields = existingRecord.ExtraFields
                     });
                 }
                 //convert plan record to service/upgrade/repair record.
@@ -1724,7 +1725,8 @@ namespace CarCareTracker.Controllers
                         Description = existingRecord.Description,
                         Cost = existingRecord.Cost,
                         Notes = existingRecord.Notes,
-                        Files = existingRecord.Files
+                        Files = existingRecord.Files,
+                        ExtraFields = existingRecord.ExtraFields
                     };
                     _serviceRecordDataAccess.SaveServiceRecordToVehicle(newRecord);
                 }
@@ -1738,7 +1740,8 @@ namespace CarCareTracker.Controllers
                         Description = existingRecord.Description,
                         Cost = existingRecord.Cost,
                         Notes = existingRecord.Notes,
-                        Files = existingRecord.Files
+                        Files = existingRecord.Files,
+                        ExtraFields = existingRecord.ExtraFields
                     };
                     _collisionRecordDataAccess.SaveCollisionRecordToVehicle(newRecord);
                 }
@@ -1752,7 +1755,8 @@ namespace CarCareTracker.Controllers
                         Description = existingRecord.Description,
                         Cost = existingRecord.Cost,
                         Notes = existingRecord.Notes,
-                        Files = existingRecord.Files
+                        Files = existingRecord.Files,
+                        ExtraFields = existingRecord.ExtraFields
                     };
                     _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(newRecord);
                 }
diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js
index 6974d49..d4c0eb8 100644
--- a/wwwroot/js/shared.js
+++ b/wwwroot/js/shared.js
@@ -394,7 +394,8 @@ function getAndValidateExtraFields() {
         var extraFieldName = $(elem).children("label").text();
         var extraFieldInput = $(elem).children("input");
         var extraFieldValue = extraFieldInput.val();
-        if (extraFieldInput.hasClass('extra-field-required') && extraFieldValue.trim() == '') {
+        var extraFieldIsRequired = extraFieldInput.hasClass('extra-field-required');
+        if (extraFieldIsRequired && extraFieldValue.trim() == '') {
             hasError = true;
             extraFieldInput.addClass("is-invalid");
         } else {
@@ -402,7 +403,7 @@ function getAndValidateExtraFields() {
         }
         //only push fields with value in them
         if (extraFieldValue.trim() != '') {
-            outputData.push({ name: extraFieldName, value: extraFieldValue });
+            outputData.push({ name: extraFieldName, value: extraFieldValue, isRequired: extraFieldIsRequired });
         }
     });
     return { hasError: hasError, extraFields: outputData };