front end logic for saving extra fields.

Controllers/HomeController.cs

@@ -73,6 +73,10 @@ namespace CarCareTracker.Controllers
         public IActionResult GetExtraFieldsModal(int importMode = 0)
         {
             var recordExtraFields = _extraFieldDataAccess.GetExtraFieldsById(importMode);
+            if (recordExtraFields.Id != importMode)
+            {
+                recordExtraFields.Id = importMode;
+            }
             return PartialView("_ExtraFields", recordExtraFields);
         }
         public IActionResult UpdateExtraFields(RecordExtraField record)

Controllers/VehicleController.cs

@@ -36,6 +36,7 @@ namespace CarCareTracker.Controllers
         private readonly IReminderHelper _reminderHelper;
         private readonly IReportHelper _reportHelper;
         private readonly IUserLogic _userLogic;
+        private readonly IExtraFieldDataAccess _extraFieldDataAccess;
 
         public VehicleController(ILogger<VehicleController> logger,
             IFileHelper fileHelper,
@@ -54,6 +55,7 @@ namespace CarCareTracker.Controllers
             IPlanRecordDataAccess planRecordDataAccess,
             IPlanRecordTemplateDataAccess planRecordTemplateDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
+            IExtraFieldDataAccess extraFieldDataAccess,
             IUserLogic userLogic,
             IWebHostEnvironment webEnv,
             IConfigHelper config)
@@ -75,6 +77,7 @@ namespace CarCareTracker.Controllers
             _planRecordDataAccess = planRecordDataAccess;
             _planRecordTemplateDataAccess = planRecordTemplateDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
+            _extraFieldDataAccess = extraFieldDataAccess;
             _userLogic = userLogic;
             _webEnv = webEnv;
             _config = config;
@@ -589,7 +592,7 @@ namespace CarCareTracker.Controllers
             var vehicleData = _dataAccess.GetVehicleById(vehicleId);
             var vehicleIsElectric = vehicleData.IsElectric;
             var vehicleUseHours = vehicleData.UseHours;
-            return PartialView("_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() });
+            return PartialView("_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields } });
         }
         [HttpGet]
         public IActionResult GetGasRecordForEditById(int gasRecordId)
@@ -607,7 +610,8 @@ namespace CarCareTracker.Controllers
                 IsFillToFull = result.IsFillToFull,
                 MissedFuelUp = result.MissedFuelUp,
                 Notes = result.Notes,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields)
             };
             var vehicleData = _dataAccess.GetVehicleById(convertedResult.VehicleId);
             var vehicleIsElectric = vehicleData.IsElectric;
@@ -678,7 +682,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddServiceRecordPartialView()
         {
-            return PartialView("_ServiceRecordModal", new ServiceRecordInput());
+            return PartialView("_ServiceRecordModal", new ServiceRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetServiceRecordForEditById(int serviceRecordId)
@@ -695,7 +699,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields)
             };
             return PartialView("_ServiceRecordModal", convertedResult);
         }
@@ -748,7 +753,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddCollisionRecordPartialView()
         {
-            return PartialView("_CollisionRecordModal", new CollisionRecordInput());
+            return PartialView("_CollisionRecordModal", new CollisionRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetCollisionRecordForEditById(int collisionRecordId)
@@ -765,7 +770,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields)
             };
             return PartialView("_CollisionRecordModal", convertedResult);
         }
@@ -822,7 +828,8 @@ namespace CarCareTracker.Controllers
                             RecurringInterval = recurringFee.RecurringInterval,
                             CustomMonthInterval = recurringFee.CustomMonthInterval,
                             Files = recurringFee.Files,
-                            Tags = recurringFee.Tags
+                            Tags = recurringFee.Tags,
+                            ExtraFields = recurringFee.ExtraFields
                         };
                         _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
                         _taxRecordDataAccess.SaveTaxRecordToVehicle(newRecurringFee);
@@ -841,7 +848,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddTaxRecordPartialView()
         {
-            return PartialView("_TaxRecordModal", new TaxRecordInput());
+            return PartialView("_TaxRecordModal", new TaxRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetTaxRecordForEditById(int taxRecordId)
@@ -860,7 +867,8 @@ namespace CarCareTracker.Controllers
                 RecurringInterval = result.RecurringInterval,
                 CustomMonthInterval = result.CustomMonthInterval,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields)
             };
             return PartialView("_TaxRecordModal", convertedResult);
         }
@@ -1417,7 +1425,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddUpgradeRecordPartialView()
         {
-            return PartialView("_UpgradeRecordModal", new UpgradeRecordInput());
+            return PartialView("_UpgradeRecordModal", new UpgradeRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetUpgradeRecordForEditById(int upgradeRecordId)
@@ -1434,7 +1442,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields)
             };
             return PartialView("_UpgradeRecordModal", convertedResult);
         }
@@ -1569,7 +1578,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddSupplyRecordPartialView()
         {
-            return PartialView("_SupplyRecordModal", new SupplyRecordInput());
+            return PartialView("_SupplyRecordModal", new SupplyRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
@@ -1588,7 +1597,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields)
             };
             return PartialView("_SupplyRecordModal", convertedResult);
         }
@@ -1682,7 +1692,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddPlanRecordPartialView()
         {
-            return PartialView("_PlanRecordModal", new PlanRecordInput());
+            return PartialView("_PlanRecordModal", new PlanRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields });
         }
         [HttpPost]
         public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
@@ -1766,7 +1776,8 @@ namespace CarCareTracker.Controllers
                 Cost = result.Cost,
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
-                Files = result.Files
+                Files = result.Files,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields)
             };
             return PartialView("_PlanRecordModal", convertedResult);
         }
@@ -1805,7 +1816,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddOdometerRecordPartialView()
         {
-            return PartialView("_OdometerRecordModal", new OdometerRecordInput());
+            return PartialView("_OdometerRecordModal", new OdometerRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetOdometerRecordForEditById(int odometerRecordId)
@@ -1820,7 +1831,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields)
             };
             return PartialView("_OdometerRecordModal", convertedResult);
         }

Helper/StaticHelper.cs

@@ -1,5 +1,6 @@
 using CarCareTracker.Models;
 using System.Globalization;
+using System.Linq;
 
 namespace CarCareTracker.Helper
 {
@@ -163,6 +164,19 @@ namespace CarCareTracker.Helper
             };
         }
 
+        public static List<ExtraField> AddExtraFields(List<ExtraField> recordExtraFields, List<ExtraField> templateExtraFields)
+        {
+            var fieldNames = recordExtraFields.Select(x => x.Name);
+            foreach(ExtraField field in templateExtraFields)
+            {
+                if (!fieldNames.Contains(field.Name))
+                {
+                    recordExtraFields.Add(field);
+                }
+            }
+            return recordExtraFields;
+        }
+
         public static string GetFuelEconomyUnit(bool useKwh, bool useHours, bool useMPG, bool useUKMPG)
         {
             string fuelEconomyUnit;

Models/RecordExtraField.cs

@@ -1,10 +1,13 @@
-namespace CarCareTracker.Models
+using LiteDB;
+
+namespace CarCareTracker.Models
 {
     public class RecordExtraField
     {
         /// <summary>
         /// Corresponds to int value of ImportMode enum
         /// </summary>
+        [BsonId(false)]
         public int Id { get; set; }
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
     }

Views/Home/_Settings.cshtml

@@ -183,7 +183,7 @@
                     <span class="lead">@translator.Translate(userLanguage, "Manage Extra Fields")</span>
                     <div class="row">
                         <div class="col-12 d-grid">
-                            <button onclick="showExtraFieldModal()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Manage")</button>
+                            <button onclick="showExtraFieldModal()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Add/Remove Extra Fields")</button>
                         </div>
                     </div>
                 </div>

wwwroot/js/collisionrecord.js

@@ -88,6 +88,10 @@ function getAndValidateCollisionRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (collisionDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#collisionRecordDate").addClass("is-invalid");
@@ -124,6 +128,7 @@ function getAndValidateCollisionRecordValues() {
         files: uploadedFiles,
         supplies: selectedSupplies,
         tags: collisionTags,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/gasrecord.js

@@ -87,6 +87,10 @@ function getAndValidateGasRecordValues() {
     var gasRecordId = getGasRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (gasDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#gasRecordDate").addClass("is-invalid");
@@ -134,7 +138,8 @@ function getAndValidateGasRecordValues() {
         tags: gasTags,
         isFillToFull: gasIsFillToFull,
         missedFuelUp: gasIsMissed,
-        notes: gasNotes
+        notes: gasNotes,
+        extraFields: extraFields.extraFields
     }
 }
 

wwwroot/js/odometerrecord.js

@@ -85,6 +85,10 @@ function getAndValidateOdometerRecordValues() {
     var odometerRecordId = getOdometerRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (serviceDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#odometerRecordDate").addClass("is-invalid");
@@ -105,6 +109,7 @@ function getAndValidateOdometerRecordValues() {
         mileage: serviceMileage,
         notes: serviceNotes,
         tags: serviceTags,
-        files: uploadedFiles
+        files: uploadedFiles,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/planrecord.js

@@ -159,6 +159,10 @@ function getAndValidatePlanRecordValues() {
     var planRecordId = getPlanRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (planDescription.trim() == '') {
         hasError = true;
         $("#planRecordDescription").addClass("is-invalid");
@@ -183,7 +187,8 @@ function getAndValidatePlanRecordValues() {
         supplies: selectedSupplies,
         priority: planPriority,
         progress: planProgress,
-        importMode: planType
+        importMode: planType,
+        extraFields: extraFields.extraFields
     }
 }
 //drag and drop stuff.

wwwroot/js/servicerecord.js

@@ -88,6 +88,10 @@ function getAndValidateServiceRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (serviceDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#serviceRecordDate").addClass("is-invalid");
@@ -124,6 +128,7 @@ function getAndValidateServiceRecordValues() {
         files: uploadedFiles,
         supplies: selectedSupplies,
         tags: serviceTags,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/supplyrecord.js

@@ -89,6 +89,10 @@ function getAndValidateSupplyRecordValues() {
     var supplyRecordId = getSupplyRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (supplyDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#supplyRecordDate").addClass("is-invalid");
@@ -125,6 +129,7 @@ function getAndValidateSupplyRecordValues() {
         notes: supplyNotes,
         quantity: supplyQuantity,
         files: uploadedFiles,
-        tags: supplyTags
+        tags: supplyTags,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/taxrecord.js

@@ -126,6 +126,10 @@ function getAndValidateTaxRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (taxDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#taxRecordDate").addClass("is-invalid");
@@ -157,6 +161,7 @@ function getAndValidateTaxRecordValues() {
         customMonthInterval: customMonthInterval,
         tags: taxTags,
         files: uploadedFiles,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/upgraderecord.js

@@ -88,6 +88,10 @@ function getAndValidateUpgradeRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (upgradeDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#upgradeRecordDate").addClass("is-invalid");
@@ -124,6 +128,7 @@ function getAndValidateUpgradeRecordValues() {
         files: uploadedFiles,
         supplies: selectedSupplies,
         tags: upgradeTags,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }