Merge pull request #776 from hargata/Hargata/745

Fix annoying bug on macOS devices where context menu hides as soon as…

Controllers/AdminController.cs

@@ -55,7 +55,7 @@ namespace CarCareTracker.Controllers
                         }
                     }
                 }
-                var successResponse = new OperationResponse { Success = true, Message = "Token Generated!" };
+                var successResponse = OperationResponse.Succeed("Token Generated!");
                 return Json(successResponse);
             } else
             {

Controllers/FilesController.cs

@@ -32,7 +32,7 @@ namespace CarCareTracker.Controllers
             var originalFileName = Path.GetFileNameWithoutExtension(file.FileName);
             if (originalFileName == "en_US")
             {
-                return Json(new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." });
+                return Json(OperationResponse.Failed("The translation file name en_US is reserved."));
             }
             var fileName = UploadFile(file);
             //move file from temp to translation folder.
@@ -41,9 +41,9 @@ namespace CarCareTracker.Controllers
             if (!string.IsNullOrWhiteSpace(uploadedFilePath))
             {
                 var result = _fileHelper.RenameFile(uploadedFilePath, originalFileName);
-                return Json(new OperationResponse { Success = result, Message = string.Empty });
+                return Json(OperationResponse.Conditional(result));
             }
-            return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+            return Json(OperationResponse.Failed());
         }
 
         [HttpPost]

Controllers/HomeController.cs

@@ -280,12 +280,12 @@ namespace CarCareTracker.Controllers
                     var result = _loginLogic.UpdateUserDetails(userId, userAccount);
                     return Json(result);
                 }
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         [HttpGet]
@@ -493,16 +493,16 @@ namespace CarCareTracker.Controllers
                 }
                 if (translationsDownloaded > 0)
                 {
-                    return Json(new OperationResponse() { Success = true, Message = $"{translationsDownloaded} Translations Downloaded" });
+                    return Json(OperationResponse.Succeed($"{translationsDownloaded} Translations Downloaded"));
                 } else
                 {
-                    return Json(new OperationResponse() { Success = false, Message = "No Translations Downloaded" });
+                    return Json(OperationResponse.Failed("No Translations Downloaded"));
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogError($"Unable to retrieve translations: {ex.Message}");
-                return Json(new OperationResponse() { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         public ActionResult GetVehicleSelector(int vehicleId)

Controllers/MigrationController.cs

@@ -15,7 +15,7 @@ namespace CarCareTracker.Controllers
         private IConfigHelper _configHelper;
         private IFileHelper _fileHelper;
         private readonly ILogger<MigrationController> _logger;
-        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, IConfiguration serverConfig, ILogger<MigrationController> logger)
+        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, ILogger<MigrationController> logger)
         {
             _configHelper = configHelper;
             _fileHelper = fileHelper;
@@ -66,7 +66,7 @@ namespace CarCareTracker.Controllers
         {
             if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
             {
-                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
+                return Json(OperationResponse.Failed("Postgres connection not set up"));
             }
             var tempFolder = $"temp/{Guid.NewGuid()}";
             var tempPath = $"{tempFolder}/cartracker.db";
@@ -419,24 +419,24 @@ namespace CarCareTracker.Controllers
                 #endregion
                 var destFilePath = $"{fullFolderPath}.zip";
                 ZipFile.CreateFromDirectory(fullFolderPath, destFilePath);
-                return Json(new OperationResponse { Success = true, Message = $"/{tempFolder}.zip" });
+                return Json(OperationResponse.Succeed($"/{tempFolder}.zip"));
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         public IActionResult Import(string fileName)
         {
             if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
             {
-                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
+                return Json(OperationResponse.Failed("Postgres connection not set up"));
             }
             var fullFileName = _fileHelper.GetFullFilePath(fileName);
             if (string.IsNullOrWhiteSpace(fullFileName))
             {
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
             try
             {
@@ -744,12 +744,12 @@ namespace CarCareTracker.Controllers
                     }
                 }
                 #endregion
-                return Json(new OperationResponse { Success = true, Message = "Data Imported Successfully" });
+                return Json(OperationResponse.Succeed("Data Imported Successfully"));
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
     }

Controllers/Vehicle/GasController.cs

@@ -35,6 +35,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveGasRecordToVehicleId(GasRecordInput gasRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), gasRecord.VehicleId))
+            {
+                return Json(false);
+            }
             if (gasRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -49,10 +54,11 @@ namespace CarCareTracker.Controllers
             var result = _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord.ToGasRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), gasRecord.VehicleId, User.Identity.Name, $"{(gasRecord.Id == default ? "Created" : "Edited")} Gas Record - Mileage: {gasRecord.Mileage.ToString()}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGasRecord(gasRecord.ToGasRecord(), gasRecord.Id == default ? "gasrecord.add" : "gasrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetAddGasRecordPartialView(int vehicleId)
         {
@@ -65,6 +71,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetGasRecordForEditById(int gasRecordId)
         {
             var result = _gasRecordDataAccess.GetGasRecordById(gasRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             var convertedResult = new GasRecordInput
             {
                 Id = result.Id,
@@ -91,14 +102,25 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_GasModal", viewModel);
         }
+        private bool DeleteGasRecordWithChecks(int gasRecordId)
+        {
+            var existingRecord = _gasRecordDataAccess.GetGasRecordById(gasRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _gasRecordDataAccess.DeleteGasRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGasRecord(existingRecord, "gasrecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteGasRecordById(int gasRecordId)
         {
-            var result = _gasRecordDataAccess.DeleteGasRecordById(gasRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Gas Record - Id: {gasRecordId}");
-            }
+            var result = DeleteGasRecordWithChecks(gasRecordId);
             return Json(result);
         }
         [HttpPost]

Controllers/Vehicle/ImportController.cs

@@ -273,13 +273,22 @@ namespace CarCareTracker.Controllers
                             var requiredExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)mode).ExtraFields.Where(x => x.IsRequired).Select(y => y.Name);
                             foreach (ImportModel importModel in records)
                             {
+                                var parsedDate = DateTime.Now.Date;
+                                if (!string.IsNullOrWhiteSpace(importModel.Date))
+                                {
+                                    parsedDate = DateTime.Parse(importModel.Date);
+                                }
+                                else if (!string.IsNullOrWhiteSpace(importModel.Day) && !string.IsNullOrWhiteSpace(importModel.Month) && !string.IsNullOrWhiteSpace(importModel.Year))
+                                {
+                                    parsedDate = new DateTime(int.Parse(importModel.Year), int.Parse(importModel.Month), int.Parse(importModel.Day));
+                                }
                                 if (mode == ImportMode.GasRecord)
                                 {
                                     //convert to gas model.
                                     var convertedRecord = new GasRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
@@ -335,9 +344,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new ServiceRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {importModel.Date}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -360,7 +369,7 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new OdometerRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         InitialMileage = string.IsNullOrWhiteSpace(importModel.InitialOdometer) ? 0 : decimal.ToInt32(decimal.Parse(importModel.InitialOdometer, NumberStyles.Any)),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
@@ -394,9 +403,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new CollisionRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {importModel.Date}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -419,9 +428,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new UpgradeRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {importModel.Date}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -444,7 +453,7 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new SupplyRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         PartNumber = importModel.PartNumber,
                                         PartSupplier = importModel.PartSupplier,
                                         Quantity = decimal.Parse(importModel.PartQuantity, NumberStyles.Any),
@@ -461,8 +470,8 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new TaxRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {importModel.Date}" : importModel.Description,
+                                        Date = parsedDate,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),

Controllers/Vehicle/NoteController.cs

@@ -12,7 +12,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetNotesByVehicleId(int vehicleId)
         {
             var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
-            result = result.OrderByDescending(x => x.Pinned).ToList();
+            result = result.OrderByDescending(x => x.Pinned).ThenBy(x => x.Description).ToList();
             return PartialView("_Notes", result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -26,11 +26,17 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveNoteToVehicleId(Note note)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), note.VehicleId))
+            {
+                return Json(false);
+            }
             note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            bool isCreate = note.Id == default; //needed here since Notes don't use an input object.
             var result = _noteDataAccess.SaveNoteToVehicle(note);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), note.VehicleId, User.Identity.Name, $"{(note.Id == default ? "Created" : "Edited")} Note - Description: {note.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromNoteRecord(note, isCreate ? "noterecord.add" : "noterecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -43,16 +49,32 @@ namespace CarCareTracker.Controllers
         public IActionResult GetNoteForEditById(int noteId)
         {
             var result = _noteDataAccess.GetNoteById(noteId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             return PartialView("_NoteModal", result);
         }
+        private bool DeleteNoteWithChecks(int noteId)
+        {
+            var existingRecord = _noteDataAccess.GetNoteById(noteId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _noteDataAccess.DeleteNoteById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromNoteRecord(existingRecord, "noterecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteNoteById(int noteId)
         {
-            var result = _noteDataAccess.DeleteNoteById(noteId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Note - Id: {noteId}");
-            }
+            var result = DeleteNoteWithChecks(noteId);
             return Json(result);
         }
         [HttpPost]

Controllers/Vehicle/OdometerController.cs

@@ -39,15 +39,21 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveOdometerRecordToVehicleId(OdometerRecordInput odometerRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), odometerRecord.VehicleId))
+            {
+                return Json(false);
+            }
             //move files from temp.
             odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord.ToOdometerRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), odometerRecord.VehicleId, User.Identity.Name, $"{(odometerRecord.Id == default ? "Created" : "Edited")} Odometer Record - Mileage: {odometerRecord.Mileage.ToString()}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromOdometerRecord(odometerRecord.ToOdometerRecord(), odometerRecord.Id == default ? "odometerrecord.add" : "odometerrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetAddOdometerRecordPartialView(int vehicleId)
         {
@@ -125,6 +131,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetOdometerRecordForEditById(int odometerRecordId)
         {
             var result = _odometerRecordDataAccess.GetOdometerRecordById(odometerRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new OdometerRecordInput
             {
@@ -140,14 +151,25 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_OdometerRecordModal", convertedResult);
         }
+        private bool DeleteOdometerRecordWithChecks(int odometerRecordId)
+        {
+            var existingRecord = _odometerRecordDataAccess.GetOdometerRecordById(odometerRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromOdometerRecord(existingRecord, "odometerrecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteOdometerRecordById(int odometerRecordId)
         {
-            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(odometerRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Odometer Record - Id: {odometerRecordId}");
-            }
+            var result = DeleteOdometerRecordWithChecks(odometerRecordId);
             return Json(result);
         }
     }

Controllers/Vehicle/PlanController.cs

@@ -17,6 +17,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SavePlanRecordToVehicleId(PlanRecordInput planRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), planRecord.VehicleId))
+            {
+                return Json(false);
+            }
             //populate createdDate
             if (planRecord.Id == default)
             {
@@ -27,31 +32,40 @@ namespace CarCareTracker.Controllers
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (planRecord.Supplies.Any())
             {
-                planRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description);
+                planRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description));
                 if (planRecord.CopySuppliesAttachment)
                 {
                     planRecord.Files.AddRange(GetSuppliesAttachments(planRecord.Supplies));
                 }
             }
+            if (planRecord.DeletedRequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(planRecord.DeletedRequisitionHistory, planRecord.Description);
+            }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(planRecord.ToPlanRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), planRecord.VehicleId, User.Identity.Name, $"{(planRecord.Id == default ? "Created" : "Edited")} Plan Record - Description: {planRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromPlanRecord(planRecord.ToPlanRecord(), planRecord.Id == default ? "planrecord.add" : "planrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
         [HttpPost]
         public IActionResult SavePlanRecordTemplateToVehicleId(PlanRecordInput planRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), planRecord.VehicleId))
+            {
+                return Json(OperationResponse.Failed("Access Denied"));
+            }
             //check if template name already taken.
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(planRecord.VehicleId).Where(x => x.Description == planRecord.Description).Any();
             if (planRecord.Id == default && existingRecord)
             {
-                return Json(new OperationResponse { Success = false, Message = "A template with that description already exists for this vehicle" });
+                return Json(OperationResponse.Failed("A template with that description already exists for this vehicle"));
             }
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _planRecordTemplateDataAccess.SavePlanRecordTemplateToVehicle(planRecord);
-            return Json(new OperationResponse { Success = result, Message = result ? "Template Added" : StaticHelper.GenericErrorMessage });
+            return Json(OperationResponse.Conditional(result, "Template Added", string.Empty));
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
@@ -63,6 +77,16 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult DeletePlanRecordTemplateById(int planRecordTemplateId)
         {
+            var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
+            if (existingRecord.Id == default)
+            {
+                return Json(false);
+            }
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return Json(false);
+            }
             var result = _planRecordTemplateDataAccess.DeletePlanRecordTemplateById(planRecordTemplateId);
             return Json(result);
         }
@@ -72,7 +96,12 @@ namespace CarCareTracker.Controllers
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
             if (existingRecord.Id == default)
             {
-                return Json(new OperationResponse { Success = false, Message = "Unable to find template" });
+                return Json(OperationResponse.Failed("Unable to find template"));
+            }
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return Json(OperationResponse.Failed("Access Denied"));
             }
             if (existingRecord.Supplies.Any())
             {
@@ -81,7 +110,7 @@ namespace CarCareTracker.Controllers
             } 
             else
             {
-                return Json(new OperationResponse { Success = false, Message = "Template has No Supplies" });
+                return Json(OperationResponse.Failed("Template has No Supplies"));
             }
         }
         [HttpPost]
@@ -90,7 +119,12 @@ namespace CarCareTracker.Controllers
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
             if (existingRecord.Id == default)
             {
-                return Json(new OperationResponse { Success = false, Message = "Unable to find template" });
+                return Json(OperationResponse.Failed("Unable to find template"));
+            }
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return Json(OperationResponse.Failed("Access Denied"));
             }
             if (existingRecord.Supplies.Any())
             {
@@ -98,11 +132,11 @@ namespace CarCareTracker.Controllers
                 var supplyAvailability = CheckSupplyRecordsAvailability(existingRecord.Supplies);
                 if (supplyAvailability.Any(x => x.Missing))
                 {
-                    return Json(new OperationResponse { Success = false, Message = "Missing Supplies, Please Delete This Template and Recreate It." });
+                    return Json(OperationResponse.Failed("Missing Supplies, Please Delete This Template and Recreate It."));
                 }
                 else if (supplyAvailability.Any(x => x.Insufficient))
                 {
-                    return Json(new OperationResponse { Success = false, Message = "Insufficient Supplies" });
+                    return Json(OperationResponse.Failed("Insufficient Supplies"));
                 }
             }
             if (existingRecord.ReminderRecordId != default)
@@ -111,7 +145,7 @@ namespace CarCareTracker.Controllers
                 var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(existingRecord.ReminderRecordId);
                 if (existingReminder is null || existingReminder.Id == default || !existingReminder.IsRecurring)
                 {
-                    return Json(new OperationResponse { Success = false, Message = "Missing or Non-recurring Reminder, Please Delete This Template and Recreate It." });
+                    return Json(OperationResponse.Failed("Missing or Non-recurring Reminder, Please Delete This Template and Recreate It."));
                 }
             }
             //populate createdDate
@@ -127,7 +161,7 @@ namespace CarCareTracker.Controllers
                 }
             }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord.ToPlanRecord());
-            return Json(new OperationResponse { Success = result, Message = result ? "Plan Record Added" : StaticHelper.GenericErrorMessage });
+            return Json(OperationResponse.Conditional(result, "Plan Record Added", string.Empty));
         }
         [HttpGet]
         public IActionResult GetAddPlanRecordPartialView()
@@ -147,7 +181,16 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
         {
+            if (planRecordId == default)
+            {
+                return Json(false);
+            }
             var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return Json(false);
+            }
             existingRecord.Progress = planProgress;
             existingRecord.DateModified = DateTime.Now;
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
@@ -231,6 +274,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetPlanRecordForEditById(int planRecordId)
         {
             var result = _planRecordDataAccess.GetPlanRecordById(planRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new PlanRecordInput
             {
@@ -254,10 +302,21 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult DeletePlanRecordById(int planRecordId)
         {
-            var result = _planRecordDataAccess.DeletePlanRecordById(planRecordId);
+            var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return Json(false);
+            }
+            //restore any requisitioned supplies if it has not been converted to other record types.
+            if (existingRecord.RequisitionHistory.Any() && existingRecord.Progress != PlanProgress.Done)
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _planRecordDataAccess.DeletePlanRecordById(existingRecord.Id);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Plan Record - Id: {planRecordId}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromPlanRecord(existingRecord, "planrecord.delete", User.Identity.Name));
             }
             return Json(result);
         }

Controllers/Vehicle/ReminderController.cs

@@ -60,6 +60,7 @@ namespace CarCareTracker.Controllers
             result = result.OrderByDescending(x => x.Urgency).ToList();
             return PartialView("_ReminderRecords", result);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetRecurringReminderRecordsByVehicleId(int vehicleId)
         {
@@ -105,10 +106,15 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveReminderRecordToVehicleId(ReminderRecordInput reminderRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), reminderRecord.VehicleId))
+            {
+                return Json(false);
+            }
             var result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(reminderRecord.ToReminderRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), reminderRecord.VehicleId, User.Identity.Name, $"{(reminderRecord.Id == default ? "Created" : "Edited")} Reminder - Description: {reminderRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromReminderRecord(reminderRecord.ToReminderRecord(), reminderRecord.Id == default ? "reminderrecord.add" : "reminderrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -128,6 +134,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetReminderRecordForEditById(int reminderRecordId)
         {
             var result = _reminderRecordDataAccess.GetReminderRecordById(reminderRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new ReminderRecordInput
             {
@@ -149,14 +160,25 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_ReminderRecordModal", convertedResult);
         }
+        private bool DeleteReminderRecordWithChecks(int reminderRecordId)
+        {
+            var existingRecord = _reminderRecordDataAccess.GetReminderRecordById(reminderRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _reminderRecordDataAccess.DeleteReminderRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromReminderRecord(existingRecord, "reminderrecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteReminderRecordById(int reminderRecordId)
         {
-            var result = _reminderRecordDataAccess.DeleteReminderRecordById(reminderRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Reminder - Id: {reminderRecordId}");
-            }
+            var result = DeleteReminderRecordWithChecks(reminderRecordId);
             return Json(result);
         }
     }

Controllers/Vehicle/RepairController.cs

@@ -26,6 +26,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveCollisionRecordToVehicleId(CollisionRecordInput collisionRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), collisionRecord.VehicleId))
+            {
+                return Json(false);
+            }
             if (collisionRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -40,12 +45,16 @@ namespace CarCareTracker.Controllers
             collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (collisionRecord.Supplies.Any())
             {
-                collisionRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description);
+                collisionRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description));
                 if (collisionRecord.CopySuppliesAttachment)
                 {
                     collisionRecord.Files.AddRange(GetSuppliesAttachments(collisionRecord.Supplies));
                 }
             }
+            if (collisionRecord.DeletedRequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(collisionRecord.DeletedRequisitionHistory, collisionRecord.Description);
+            }
             //push back any reminders
             if (collisionRecord.ReminderRecordId.Any())
             {
@@ -57,7 +66,7 @@ namespace CarCareTracker.Controllers
             var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), collisionRecord.VehicleId, User.Identity.Name, $"{(collisionRecord.Id == default ? "Created" : "Edited")} Repair Record - Description: {collisionRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(collisionRecord.ToCollisionRecord(), collisionRecord.Id == default ? "repairrecord.add" : "repairrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -70,6 +79,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetCollisionRecordForEditById(int collisionRecordId)
         {
             var result = _collisionRecordDataAccess.GetCollisionRecordById(collisionRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new CollisionRecordInput
             {
@@ -87,14 +101,30 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_CollisionRecordModal", convertedResult);
         }
+        private bool DeleteCollisionRecordWithChecks(int collisionRecordId)
+        {
+            var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(collisionRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            //restore any requisitioned supplies.
+            if (existingRecord.RequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _collisionRecordDataAccess.DeleteCollisionRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(existingRecord, "repairrecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteCollisionRecordById(int collisionRecordId)
         {
-            var result = _collisionRecordDataAccess.DeleteCollisionRecordById(collisionRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Repair Record - Id: {collisionRecordId}");
-            }
+            var result = DeleteCollisionRecordWithChecks(collisionRecordId);
             return Json(result);
         }
     }

Controllers/Vehicle/ReportController.cs

@@ -311,13 +311,13 @@ namespace CarCareTracker.Controllers
                 var result = _fileHelper.MakeAttachmentsExport(attachmentData);
                 if (string.IsNullOrWhiteSpace(result))
                 {
-                    return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                    return Json(OperationResponse.Failed());
                 }
-                return Json(new OperationResponse { Success = true, Message = result });
+                return Json(OperationResponse.Succeed(result));
             }
             else
             {
-                return Json(new OperationResponse { Success = false, Message = "No Attachments Found" });
+                return Json(OperationResponse.Failed("No Attachments Found"));
             }
         }
         public IActionResult GetReportParameters()
@@ -349,9 +349,57 @@ namespace CarCareTracker.Controllers
             var vehicleHistory = new VehicleHistoryViewModel();
             vehicleHistory.ReportParameters = reportParameter;
             vehicleHistory.VehicleData = _dataAccess.GetVehicleById(vehicleId);
-            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleId);
+            var vehicleRecords = _vehicleLogic.GetVehicleRecords(vehicleId);
+            bool useMPG = _config.GetUserConfig(User).UseMPG;
+            bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
+            var gasViewModels = _gasHelper.GetGasRecordViewModels(vehicleRecords.GasRecords, useMPG, useUKMPG);
+            //filter by tags
+            if (reportParameter.Tags.Any())
+            {
+                if (reportParameter.TagFilter == TagFilter.Exclude)
+                {
+                    vehicleRecords.OdometerRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.ServiceRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.CollisionRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.UpgradeRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.TaxRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    gasViewModels.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.GasRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                }
+                else if (reportParameter.TagFilter == TagFilter.IncludeOnly)
+                {
+                    vehicleRecords.OdometerRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.ServiceRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.CollisionRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.UpgradeRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.TaxRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    gasViewModels.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                    vehicleRecords.GasRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
+                }
+            }
+            //filter by date range.
+            if (reportParameter.FilterByDateRange && !string.IsNullOrWhiteSpace(reportParameter.StartDate) && !string.IsNullOrWhiteSpace(reportParameter.EndDate))
+            {
+                var startDate = DateTime.Parse(reportParameter.StartDate).Date;
+                var endDate = DateTime.Parse(reportParameter.EndDate).Date;
+                //validate date range
+                if (endDate >= startDate) //allow for same day.
+                {
+                    vehicleHistory.StartDate = reportParameter.StartDate;
+                    vehicleHistory.EndDate = reportParameter.EndDate;
+                    //remove all records with dates after the end date and dates before the start date.
+                    vehicleRecords.OdometerRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
+                    vehicleRecords.ServiceRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
+                    vehicleRecords.CollisionRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
+                    vehicleRecords.UpgradeRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
+                    vehicleRecords.TaxRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
+                    gasViewModels.RemoveAll(x => DateTime.Parse(x.Date).Date > endDate || DateTime.Parse(x.Date).Date < startDate);
+                    vehicleRecords.GasRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
+                }
+            }
+            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
             vehicleHistory.Odometer = maxMileage.ToString("N0");
-            var minMileage = _vehicleLogic.GetMinMileage(vehicleId);
+            var minMileage = _vehicleLogic.GetMinMileage(vehicleRecords);
             var distanceTraveled = maxMileage - minMileage;
             if (!string.IsNullOrWhiteSpace(vehicleHistory.VehicleData.PurchaseDate))
             {
@@ -388,17 +436,10 @@ namespace CarCareTracker.Controllers
                 }
             }
             List<GenericReportModel> reportData = new List<GenericReportModel>();
-            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
-            var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
-            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
-            var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
-            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
-            bool useMPG = _config.GetUserConfig(User).UseMPG;
-            bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
             string preferredFuelMileageUnit = _config.GetUserConfig(User).PreferredGasMileageUnit;
             vehicleHistory.DistanceUnit = vehicleHistory.VehicleData.UseHours ? "h" : useMPG ? "mi." : "km";
-            vehicleHistory.TotalGasCost = gasRecords.Sum(x => x.Cost);
-            vehicleHistory.TotalCost = serviceRecords.Sum(x => x.Cost) + repairRecords.Sum(x => x.Cost) + upgradeRecords.Sum(x => x.Cost) + taxRecords.Sum(x => x.Cost);
+            vehicleHistory.TotalGasCost = gasViewModels.Sum(x => x.Cost);
+            vehicleHistory.TotalCost = vehicleRecords.ServiceRecords.Sum(x => x.Cost) + vehicleRecords.CollisionRecords.Sum(x => x.Cost) + vehicleRecords.UpgradeRecords.Sum(x => x.Cost) + vehicleRecords.TaxRecords.Sum(x => x.Cost);
             if (distanceTraveled != default)
             {
                 vehicleHistory.DistanceTraveled = distanceTraveled.ToString("N0");
@@ -406,7 +447,6 @@ namespace CarCareTracker.Controllers
                 vehicleHistory.TotalGasCostPerMile = vehicleHistory.TotalGasCost / distanceTraveled;
             }
             var averageMPG = "0";
-            var gasViewModels = _gasHelper.GetGasRecordViewModels(gasRecords, useMPG, useUKMPG);
             if (gasViewModels.Any())
             {
                 averageMPG = _gasHelper.GetAverageGasMileage(gasViewModels, useMPG);
@@ -425,7 +465,7 @@ namespace CarCareTracker.Controllers
             }
             vehicleHistory.MPG = $"{averageMPG} {fuelEconomyMileageUnit}";
             //insert servicerecords
-            reportData.AddRange(serviceRecords.Select(x => new GenericReportModel
+            reportData.AddRange(vehicleRecords.ServiceRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = x.Mileage,
@@ -436,7 +476,7 @@ namespace CarCareTracker.Controllers
                 ExtraFields = x.ExtraFields
             }));
             //repair records
-            reportData.AddRange(repairRecords.Select(x => new GenericReportModel
+            reportData.AddRange(vehicleRecords.CollisionRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = x.Mileage,
@@ -446,7 +486,7 @@ namespace CarCareTracker.Controllers
                 DataType = ImportMode.RepairRecord,
                 ExtraFields = x.ExtraFields
             }));
-            reportData.AddRange(upgradeRecords.Select(x => new GenericReportModel
+            reportData.AddRange(vehicleRecords.UpgradeRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = x.Mileage,
@@ -456,7 +496,7 @@ namespace CarCareTracker.Controllers
                 DataType = ImportMode.UpgradeRecord,
                 ExtraFields = x.ExtraFields
             }));
-            reportData.AddRange(taxRecords.Select(x => new GenericReportModel
+            reportData.AddRange(vehicleRecords.TaxRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = 0,
@@ -558,6 +598,55 @@ namespace CarCareTracker.Controllers
             }).ToList();
             return PartialView("_GasCostByMonthReport", groupedRecord);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult GetCostByMonthAndYearByVehicle(int vehicleId, List<ImportMode> selectedMetrics, int year = 0)
+        {
+            List<CostForVehicleByMonth> allCosts = StaticHelper.GetBaseLineCosts();
+            if (selectedMetrics.Contains(ImportMode.ServiceRecord))
+            {
+                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.RepairRecord))
+            {
+                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetRepairRecordSum(repairRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.UpgradeRecord))
+            {
+                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.GasRecord))
+            {
+                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.TaxRecord))
+            {
+                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.OdometerRecord))
+            {
+                var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetOdometerRecordSum(odometerRecords, year, true));
+            }
+            var groupedRecord = allCosts.GroupBy(x => new { x.MonthName, x.MonthId, x.Year }).OrderByDescending(x=>x.Key.Year).Select(x => new CostForVehicleByMonth
+            {
+                Year = x.Key.Year,
+                MonthName = x.Key.MonthName,
+                Cost = x.Sum(y => y.Cost),
+                DistanceTraveled = x.Max(y => y.DistanceTraveled),
+                MonthId = x.Key.MonthId
+            }).ToList();
+            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
+            var userConfig = _config.GetUserConfig(User);
+            var viewModel = new CostDistanceTableForVehicle { CostData = groupedRecord };
+            viewModel.DistanceUnit = vehicleData.UseHours ? "h" : userConfig.UseMPG ? "mi." : "km";
+            return PartialView("_CostDistanceTableReport", viewModel);
+        }
         [HttpGet]
         public IActionResult GetAdditionalWidgets()
         {

Controllers/Vehicle/ServiceController.cs

@@ -26,6 +26,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveServiceRecordToVehicleId(ServiceRecordInput serviceRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), serviceRecord.VehicleId))
+            {
+                return Json(false);
+            }
             if (serviceRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -40,12 +45,16 @@ namespace CarCareTracker.Controllers
             serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (serviceRecord.Supplies.Any())
             {
-                serviceRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description);
+                serviceRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description));
                 if (serviceRecord.CopySuppliesAttachment)
                 {
                     serviceRecord.Files.AddRange(GetSuppliesAttachments(serviceRecord.Supplies));
                 }
             }
+            if (serviceRecord.DeletedRequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(serviceRecord.DeletedRequisitionHistory, serviceRecord.Description);
+            }
             //push back any reminders
             if (serviceRecord.ReminderRecordId.Any())
             {
@@ -57,7 +66,7 @@ namespace CarCareTracker.Controllers
             var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), serviceRecord.VehicleId, User.Identity.Name, $"{(serviceRecord.Id == default ? "Created" : "Edited")} Service Record - Description: {serviceRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(serviceRecord.ToServiceRecord(), serviceRecord.Id == default ? "servicerecord.add" : "servicerecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -70,6 +79,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetServiceRecordForEditById(int serviceRecordId)
         {
             var result = _serviceRecordDataAccess.GetServiceRecordById(serviceRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new ServiceRecordInput
             {
@@ -87,14 +101,30 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_ServiceRecordModal", convertedResult);
         }
+        private bool DeleteServiceRecordWithChecks(int serviceRecordId)
+        {
+            var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(serviceRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            //restore any requisitioned supplies.
+            if (existingRecord.RequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _serviceRecordDataAccess.DeleteServiceRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(existingRecord, "servicerecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteServiceRecordById(int serviceRecordId)
         {
-            var result = _serviceRecordDataAccess.DeleteServiceRecordById(serviceRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Service Record - Id: {serviceRecordId}");
-            }
+            var result = DeleteServiceRecordWithChecks(serviceRecordId);
             return Json(result);
         }
     }

Controllers/Vehicle/SupplyController.cs

@@ -58,6 +58,7 @@ namespace CarCareTracker.Controllers
                 //create new requisitionrrecord
                 var requisitionRecord = new SupplyUsageHistory
                 {
+                    Id = supply.SupplyId,
                     Date = dateRequisitioned,
                     Description = usageDescription,
                     Quantity = supply.Quantity,
@@ -72,6 +73,7 @@ namespace CarCareTracker.Controllers
             }
             return results;
         }
+        
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
@@ -148,7 +150,7 @@ namespace CarCareTracker.Controllers
             var result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(supplyRecord.ToSupplyRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), supplyRecord.VehicleId, User.Identity.Name, $"{(supplyRecord.Id == default ? "Created" : "Edited")} Supply Record - Description: {supplyRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromSupplyRecord(supplyRecord.ToSupplyRecord(), supplyRecord.Id == default ? "supplyrecord.add" : "supplyrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -161,6 +163,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
         {
             var result = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
+            if (result.RequisitionHistory.Any())
+            {
+                //requisition history when viewed through the supply is always immutable.
+                result.RequisitionHistory = result.RequisitionHistory.Select(x => new SupplyUsageHistory { Id = default, Cost = x.Cost, Description = x.Description, Date = x.Date, PartNumber = x.PartNumber, Quantity = x.Quantity }).ToList();
+            }
             //convert to Input object.
             var convertedResult = new SupplyRecordInput
             {
@@ -180,14 +187,28 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_SupplyRecordModal", convertedResult);
         }
+        private bool DeleteSupplyRecordWithChecks(int supplyRecordId)
+        {
+            var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
+            if (existingRecord.VehicleId != default)
+            {
+                //security check only if not editing shop supply.
+                if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+                {
+                    return false;
+                }
+            }
+            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromSupplyRecord(existingRecord, "supplyrecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteSupplyRecordById(int supplyRecordId)
         {
-            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(supplyRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Supply Record - Id: {supplyRecordId}");
-            }
+            var result = DeleteSupplyRecordWithChecks(supplyRecordId);
             return Json(result);
         }
     }

Controllers/Vehicle/TaxController.cs

@@ -23,49 +23,29 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_TaxRecords", result);
         }
-        private void UpdateRecurringTaxes(int vehicleId)
+
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult CheckRecurringTaxRecords(int vehicleId)
         {
-            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
-            var recurringFees = result.Where(x => x.IsRecurring);
-            if (recurringFees.Any())
+            try
             {
-                foreach (TaxRecord recurringFee in recurringFees)
-                {
-                    var newDate = new DateTime();
-                    if (recurringFee.RecurringInterval != ReminderMonthInterval.Other)
-                    {
-                        newDate = recurringFee.Date.AddMonths((int)recurringFee.RecurringInterval);
-                    }
-                    else
-                    {
-                        newDate = recurringFee.Date.AddMonths(recurringFee.CustomMonthInterval);
-                    }
-                    if (DateTime.Now > newDate)
-                    {
-                        recurringFee.IsRecurring = false;
-                        var newRecurringFee = new TaxRecord()
-                        {
-                            VehicleId = recurringFee.VehicleId,
-                            Date = newDate,
-                            Description = recurringFee.Description,
-                            Cost = recurringFee.Cost,
-                            IsRecurring = true,
-                            Notes = recurringFee.Notes,
-                            RecurringInterval = recurringFee.RecurringInterval,
-                            CustomMonthInterval = recurringFee.CustomMonthInterval,
-                            Files = recurringFee.Files,
-                            Tags = recurringFee.Tags,
-                            ExtraFields = recurringFee.ExtraFields
-                        };
-                        _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
-                        _taxRecordDataAccess.SaveTaxRecordToVehicle(newRecurringFee);
-                    }
-                }
+                var result = _vehicleLogic.UpdateRecurringTaxes(vehicleId);
+                return Json(result);
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return Json(false);
             }
         }
         [HttpPost]
         public IActionResult SaveTaxRecordToVehicleId(TaxRecordInput taxRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), taxRecord.VehicleId))
+            {
+                return Json(false);
+            }
             //move files from temp.
             taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             //push back any reminders
@@ -77,9 +57,10 @@ namespace CarCareTracker.Controllers
                 }
             }
             var result = _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord.ToTaxRecord());
+            _vehicleLogic.UpdateRecurringTaxes(taxRecord.VehicleId);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), taxRecord.VehicleId, User.Identity.Name, $"{(taxRecord.Id == default ? "Created" : "Edited")} Tax Record - Description: {taxRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromTaxRecord(taxRecord.ToTaxRecord(), taxRecord.Id == default ? "taxrecord.add" : "taxrecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -92,6 +73,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetTaxRecordForEditById(int taxRecordId)
         {
             var result = _taxRecordDataAccess.GetTaxRecordById(taxRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new TaxRecordInput
             {
@@ -110,14 +96,25 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_TaxRecordModal", convertedResult);
         }
+        private bool DeleteTaxRecordWithChecks(int taxRecordId)
+        {
+            var existingRecord = _taxRecordDataAccess.GetTaxRecordById(taxRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _taxRecordDataAccess.DeleteTaxRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromTaxRecord(existingRecord, "taxrecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteTaxRecordById(int taxRecordId)
         {
-            var result = _taxRecordDataAccess.DeleteTaxRecordById(taxRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Tax Record - Id: {taxRecordId}");
-            }
+            var result = DeleteTaxRecordWithChecks(taxRecordId);
             return Json(result);
         }
     }

Controllers/Vehicle/UpgradeController.cs

@@ -26,6 +26,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveUpgradeRecordToVehicleId(UpgradeRecordInput upgradeRecord)
         {
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), upgradeRecord.VehicleId))
+            {
+                return Json(false);
+            }
             if (upgradeRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -40,12 +45,16 @@ namespace CarCareTracker.Controllers
             upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (upgradeRecord.Supplies.Any())
             {
-                upgradeRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description);
+                upgradeRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description));
                 if (upgradeRecord.CopySuppliesAttachment)
                 {
                     upgradeRecord.Files.AddRange(GetSuppliesAttachments(upgradeRecord.Supplies));
                 }
             }
+            if (upgradeRecord.DeletedRequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(upgradeRecord.DeletedRequisitionHistory, upgradeRecord.Description);
+            }
             //push back any reminders
             if (upgradeRecord.ReminderRecordId.Any())
             {
@@ -57,7 +66,7 @@ namespace CarCareTracker.Controllers
             var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), upgradeRecord.VehicleId, User.Identity.Name, $"{(upgradeRecord.Id == default ? "Created" : "Edited")} Upgrade Record - Description: {upgradeRecord.Description}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(upgradeRecord.ToUpgradeRecord(), upgradeRecord.Id == default ? "upgraderecord.add" : "upgraderecord.update", User.Identity.Name));
             }
             return Json(result);
         }
@@ -70,6 +79,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetUpgradeRecordForEditById(int upgradeRecordId)
         {
             var result = _upgradeRecordDataAccess.GetUpgradeRecordById(upgradeRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
+            {
+                return Redirect("/Error/Unauthorized");
+            }
             //convert to Input object.
             var convertedResult = new UpgradeRecordInput
             {
@@ -87,14 +101,30 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_UpgradeRecordModal", convertedResult);
         }
+        private bool DeleteUpgradeRecordWithChecks(int upgradeRecordId)
+        {
+            var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(upgradeRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            //restore any requisitioned supplies.
+            if (existingRecord.RequisitionHistory.Any())
+            {
+                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(existingRecord.Id);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(existingRecord, "upgraderecord.delete", User.Identity.Name));
+            }
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteUpgradeRecordById(int upgradeRecordId)
         {
-            var result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(upgradeRecordId);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Upgrade Record - Id: {upgradeRecordId}");
-            }
+            var result = DeleteUpgradeRecordWithChecks(upgradeRecordId);
             return Json(result);
         }
     }

Controllers/VehicleController.cs

@@ -95,7 +95,6 @@ namespace CarCareTracker.Controllers
         public IActionResult Index(int vehicleId)
         {
             var data = _dataAccess.GetVehicleById(vehicleId);
-            UpdateRecurringTaxes(vehicleId);
             return View(data);
         }
         [HttpGet]
@@ -131,10 +130,10 @@ namespace CarCareTracker.Controllers
                 if (isNewAddition)
                 {
                     _userLogic.AddUserAccessToVehicle(GetUserID(), vehicleInput.Id);
-                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleInput.Id, User.Identity.Name, $"Added Vehicle - Description: {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}");
+                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Created Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.add", User.Identity.Name, vehicleInput.Id.ToString()));
                 } else
                 {
-                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleInput.Id, User.Identity.Name, $"Edited Vehicle - Description: {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}");
+                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Updated Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.update", User.Identity.Name, vehicleInput.Id.ToString()));
                 }
                 return Json(result);
             }
@@ -164,7 +163,7 @@ namespace CarCareTracker.Controllers
                 _dataAccess.DeleteVehicle(vehicleId);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, "Deleted Vehicle");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic(string.Empty, "vehicle.delete", User.Identity.Name, vehicleId.ToString()));
             }
             return Json(result);
         }
@@ -188,15 +187,15 @@ namespace CarCareTracker.Controllers
                     }
                     else
                     {
-                        return Json(new OperationResponse { Success = false, Message = "Both vehicles already have identical collaborators" });
+                        return Json(OperationResponse.Failed("Both vehicles already have identical collaborators"));
                     }
                 }
-                return Json(new OperationResponse { Success = true, Message = "Collaborators Copied" });
+                return Json(OperationResponse.Succeed("Collaborators Copied"));
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         
@@ -389,7 +388,7 @@ namespace CarCareTracker.Controllers
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Moved multiple {source.ToString()} to {destination.ToString()} - Ids: {string.Join(",", recordIds)}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Moved multiple {source.ToString()} to {destination.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.move", User.Identity.Name, string.Empty));
             }
             return Json(result);
         }
@@ -401,37 +400,37 @@ namespace CarCareTracker.Controllers
                 switch (importMode)
                 {
                     case ImportMode.ServiceRecord:
-                        result = _serviceRecordDataAccess.DeleteServiceRecordById(recordId);
+                        result = DeleteServiceRecordWithChecks(recordId);
                         break;
                     case ImportMode.RepairRecord:
-                        result = _collisionRecordDataAccess.DeleteCollisionRecordById(recordId);
+                        result = DeleteCollisionRecordWithChecks(recordId);
                         break;
                     case ImportMode.UpgradeRecord:
-                        result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(recordId);
+                        result = DeleteUpgradeRecordWithChecks(recordId);
                         break;
                     case ImportMode.GasRecord:
-                        result = _gasRecordDataAccess.DeleteGasRecordById(recordId);
+                        result = DeleteGasRecordWithChecks(recordId);
                         break;
                     case ImportMode.TaxRecord:
-                        result = _taxRecordDataAccess.DeleteTaxRecordById(recordId);
+                        result = DeleteTaxRecordWithChecks(recordId);
                         break;
                     case ImportMode.SupplyRecord:
-                        result = _supplyRecordDataAccess.DeleteSupplyRecordById(recordId);
+                        result = DeleteSupplyRecordWithChecks(recordId);
                         break;
                     case ImportMode.NoteRecord:
-                        result = _noteDataAccess.DeleteNoteById(recordId);
+                        result = DeleteNoteWithChecks(recordId);
                         break;
                     case ImportMode.OdometerRecord:
-                        result = _odometerRecordDataAccess.DeleteOdometerRecordById(recordId);
+                        result = DeleteOdometerRecordWithChecks(recordId);
                         break;
                     case ImportMode.ReminderRecord:
-                        result = _reminderRecordDataAccess.DeleteReminderRecordById(recordId);
+                        result = DeleteReminderRecordWithChecks(recordId);
                         break;
                 }
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Deleted multiple {importMode.ToString()} - Ids: {string.Join(", ", recordIds)}", "bulk.delete", User.Identity.Name, string.Empty));
             }
             return Json(result);
         }
@@ -490,7 +489,7 @@ namespace CarCareTracker.Controllers
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Adjusted odometer for multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Adjusted odometer for multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.odometer.adjust", User.Identity.Name, string.Empty));
             }
             return Json(result);
         }
@@ -506,6 +505,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
                         }
                         break;
@@ -513,6 +513,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(existingRecord);
                         }
                         break;
@@ -520,6 +521,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(existingRecord);
                         }
                         break;
@@ -541,6 +543,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(existingRecord);
                         }
                         break;
@@ -565,11 +568,20 @@ namespace CarCareTracker.Controllers
                             result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingRecord);
                         }
                         break;
+                    case ImportMode.PlanRecord:
+                        {
+                            var existingRecord = _planRecordDataAccess.GetPlanRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.ReminderRecordId = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
+                        }
+                        break;
                 }
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.duplicate", User.Identity.Name, string.Empty));
             }
             return Json(result);
         }
@@ -589,7 +601,8 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
                             existingRecord.Id = default;
-                            foreach(int vehicleId in vehicleIds)
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            foreach (int vehicleId in vehicleIds)
                             {
                                 existingRecord.VehicleId = vehicleId;
                                 result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
@@ -600,6 +613,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             foreach (int vehicleId in vehicleIds)
                             {
                                 existingRecord.VehicleId = vehicleId;
@@ -611,6 +625,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             foreach (int vehicleId in vehicleIds)
                             {
                                 existingRecord.VehicleId = vehicleId;
@@ -684,11 +699,88 @@ namespace CarCareTracker.Controllers
                             }
                         }
                         break;
+                    case ImportMode.PlanRecord:
+                        {
+                            var existingRecord = _planRecordDataAccess.GetPlanRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.ReminderRecordId = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
                 }
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)} - to Vehicle Ids: {string.Join(",", vehicleIds)}");
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)} - to Vehicle Ids: {string.Join(",", vehicleIds)}", "bulk.duplicate.to.vehicles", User.Identity.Name, string.Join(",", vehicleIds)));
+            }
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult BulkCreateOdometerRecords(List<int> recordIds, ImportMode importMode)
+        {
+            bool result = false;
+            foreach (int recordId in recordIds)
+            {
+                switch (importMode)
+                {
+                    case ImportMode.ServiceRecord:
+                        {
+                            var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
+                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
+                            {
+                                Date = existingRecord.Date,
+                                VehicleId = existingRecord.VehicleId,
+                                Mileage = existingRecord.Mileage,
+                                Notes = $"Auto Insert From Service Record: {existingRecord.Description}"
+                            });
+                        }
+                        break;
+                    case ImportMode.RepairRecord:
+                        {
+                            var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
+                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
+                            {
+                                Date = existingRecord.Date,
+                                VehicleId = existingRecord.VehicleId,
+                                Mileage = existingRecord.Mileage,
+                                Notes = $"Auto Insert From Repair Record: {existingRecord.Description}"
+                            });
+                        }
+                        break;
+                    case ImportMode.UpgradeRecord:
+                        {
+                            var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
+                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
+                            {
+                                Date = existingRecord.Date,
+                                VehicleId = existingRecord.VehicleId,
+                                Mileage = existingRecord.Mileage,
+                                Notes = $"Auto Insert From Upgrade Record: {existingRecord.Description}"
+                            });
+                        }
+                        break;
+                    case ImportMode.GasRecord:
+                        {
+                            var existingRecord = _gasRecordDataAccess.GetGasRecordById(recordId);
+                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
+                            {
+                                Date = existingRecord.Date,
+                                VehicleId = existingRecord.VehicleId,
+                                Mileage = existingRecord.Mileage,
+                                Notes = $"Auto Insert From Gas Record. {existingRecord.Notes}"
+                            });
+                        }
+                        break;
+                }
+            }
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Created Odometer Records based on {importMode.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.odometer.insert", User.Identity.Name, string.Empty));
             }
             return Json(result);
         }

Enum/TagFilter.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public enum TagFilter
+    {
+        Exclude = 0,
+        IncludeOnly = 1
+    }
+}

Filter/CollaboratorFilter.cs

@@ -19,27 +19,34 @@ namespace CarCareTracker.Filter
         {
             if (!filterContext.HttpContext.User.IsInRole(nameof(UserData.IsRootUser)))
             {
-                var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
-                if (vehicleId != default)
+                if (filterContext.ActionArguments.ContainsKey("vehicleId"))
                 {
-                    var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
-                    if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
+                    var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
+                    if (vehicleId != default)
                     {
-                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                        var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                        if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
+                        {
+                            filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                        }
+                    }
+                    else
+                    {
+                        var shopSupplyEndpoints = new List<string> { "ImportToVehicleIdFromCsv", "GetSupplyRecordsByVehicleId", "ExportFromVehicleToCsv" };
+                        if (shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()) && !_config.GetServerEnableShopSupplies())
+                        {
+                            //user trying to access shop supplies but shop supplies is not enabled by root user.
+                            filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                        }
+                        else if (!shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()))
+                        {
+                            //user trying to access any other endpoints using 0 as vehicle id.
+                            filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                        }
                     }
                 } else
                 {
-                    var shopSupplyEndpoints = new List<string> { "ImportToVehicleIdFromCsv", "GetSupplyRecordsByVehicleId", "ExportFromVehicleToCsv" };
-                    if (shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()) && !_config.GetServerEnableShopSupplies())
-                    {
-                        //user trying to access shop supplies but shop supplies is not enabled by root user.
-                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
-                    }
-                    else if (!shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()))
-                    {
-                        //user trying to access any other endpoints using 0 as vehicle id.
-                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
-                    }
+                    filterContext.Result = new RedirectResult("/Error/Unauthorized");
                 }
             }
         }

Helper/ConfigHelper.cs

@@ -10,6 +10,7 @@ namespace CarCareTracker.Helper
     {
         OpenIDConfig GetOpenIDConfig();
         ReminderUrgencyConfig GetReminderUrgencyConfig();
+        MailConfig GetMailConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         bool AuthenticateRootUser(string username, string password);
@@ -23,41 +24,41 @@ namespace CarCareTracker.Helper
         bool GetServerEnableShopSupplies();
         string GetServerPostgresConnection();
         string GetAllowedFileUploadExtensions();
-        public bool DeleteUserConfig(int userId);
+        bool DeleteUserConfig(int userId);
+        bool GetInvariantApi();
     }
     public class ConfigHelper : IConfigHelper
     {
         private readonly IConfiguration _config;
         private readonly IUserConfigDataAccess _userConfig;
+        private readonly ILogger<IConfigHelper> _logger;
         private IMemoryCache _cache;
         public ConfigHelper(IConfiguration serverConfig, 
             IUserConfigDataAccess userConfig,
-            IMemoryCache memoryCache)
+            IMemoryCache memoryCache,
+            ILogger<IConfigHelper> logger)
         {
             _config = serverConfig;
             _userConfig = userConfig;
             _cache = memoryCache;
+            _logger = logger;
         }
         public string GetWebHookUrl()
         {
-            var webhook = _config["LUBELOGGER_WEBHOOK"];
-            if (string.IsNullOrWhiteSpace(webhook))
-            {
-                webhook = "";
-            }
+            var webhook = CheckString("LUBELOGGER_WEBHOOK");
             return webhook;
         }
         public bool GetCustomWidgetsEnabled()
         {
-            return bool.Parse(_config["LUBELOGGER_CUSTOM_WIDGETS"] ?? "false");
+            return CheckBool(CheckString("LUBELOGGER_CUSTOM_WIDGETS"));
+        }
+        public bool GetInvariantApi()
+        {
+            return CheckBool(CheckString("LUBELOGGER_INVARIANT_API"));
         }
         public string GetMOTD()
         {
-            var motd = _config["LUBELOGGER_MOTD"];
-            if (string.IsNullOrWhiteSpace(motd))
-            {
-                motd = "";
-            }
+            var motd = CheckString("LUBELOGGER_MOTD");
             return motd;
         }
         public OpenIDConfig GetOpenIDConfig()
@@ -70,27 +71,25 @@ namespace CarCareTracker.Helper
             ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig();
             return reminderUrgencyConfig;
         }
+        public MailConfig GetMailConfig()
+        {
+            MailConfig mailConfig = _config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
+            return mailConfig;
+        }
         public string GetLogoUrl()
         {
-            var logoUrl = _config["LUBELOGGER_LOGO_URL"];
-            if (string.IsNullOrWhiteSpace(logoUrl))
-            {
-                logoUrl = "/defaults/lubelogger_logo.png";
-            }
+            var logoUrl = CheckString("LUBELOGGER_LOGO_URL", "/defaults/lubelogger_logo.png");
             return logoUrl;
         }
         public string GetAllowedFileUploadExtensions()
         {
-            var allowedFileExtensions = _config["LUBELOGGER_ALLOWED_FILE_EXTENSIONS"];
-            if (string.IsNullOrWhiteSpace(allowedFileExtensions)){
-                return StaticHelper.DefaultAllowedFileExtensions;
-            }
+            var allowedFileExtensions = CheckString("LUBELOGGER_ALLOWED_FILE_EXTENSIONS", StaticHelper.DefaultAllowedFileExtensions);
             return allowedFileExtensions;
         }
         public bool AuthenticateRootUser(string username, string password)
         {
-            var rootUsername = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty;
-            var rootPassword = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty;
+            var rootUsername = CheckString(nameof(UserConfig.UserNameHash));
+            var rootPassword = CheckString(nameof(UserConfig.UserPasswordHash));
             if (string.IsNullOrWhiteSpace(rootUsername) || string.IsNullOrWhiteSpace(rootPassword))
             {
                 return false;
@@ -99,8 +98,8 @@ namespace CarCareTracker.Helper
         }
         public bool AuthenticateRootUserOIDC(string email)
         {
-            var rootEmail = _config[nameof(UserConfig.DefaultReminderEmail)] ?? string.Empty;
-            var rootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]);
+            var rootEmail = CheckString(nameof(UserConfig.DefaultReminderEmail));
+            var rootUserOIDC = CheckBool(CheckString(nameof(UserConfig.EnableRootUserOIDC)));
             if (!rootUserOIDC || string.IsNullOrWhiteSpace(rootEmail))
             {
                 return false;
@@ -109,27 +108,22 @@ namespace CarCareTracker.Helper
         }
         public string GetServerLanguage()
         {
-            var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+            var serverLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US");
             return serverLanguage;
         }
         public bool GetServerDisabledRegistration()
         {
-            var registrationDisabled = bool.Parse(_config[nameof(UserConfig.DisableRegistration)]);
+            var registrationDisabled = CheckBool(CheckString(nameof(UserConfig.DisableRegistration)));
             return registrationDisabled;
         }
         public string GetServerPostgresConnection()
         {
-            if (!string.IsNullOrWhiteSpace(_config["POSTGRES_CONNECTION"]))
-            {
-                return _config["POSTGRES_CONNECTION"];
-            } else
-            {
-                return string.Empty;
-            }
+            var postgresConnection = CheckString("POSTGRES_CONNECTION");
+            return postgresConnection;
         }
         public bool GetServerEnableShopSupplies()
         {
-            return bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)] ?? "false");
+            return CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies)));
         }
         public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
         {
@@ -159,6 +153,7 @@ namespace CarCareTracker.Helper
                 }
                 catch (Exception ex)
                 {
+                    _logger.LogWarning(ex.Message);
                     return false;
                 }
             } else
@@ -179,37 +174,73 @@ namespace CarCareTracker.Helper
             var result = _userConfig.DeleteUserConfig(userId);
             return result;
         }
+        private bool CheckBool(string value, bool defaultValue = false)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    return defaultValue;
+                }
+                else if (bool.TryParse(value, out bool result))
+                {
+                    return result;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogWarning($"ConfigHelper Warning: You might be missing keys in appsettings.json, Message: ${ex.Message}");
+                return defaultValue;
+            }
+        }
+        private string CheckString(string configName, string defaultValue = "")
+        {
+            try
+            {
+                var configValue = _config[configName] ?? defaultValue;
+                return configValue;
+            } catch(Exception ex)
+            {
+                _logger.LogWarning($"ConfigHelper Warning: You might be missing keys in appsettings.json, Message: ${ex.Message}");
+                return defaultValue;
+            }
+        }
         public UserConfig GetUserConfig(ClaimsPrincipal user)
         {
             var serverConfig = new UserConfig
             {
-                EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
-                UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
-                UseSystemColorMode = bool.Parse(_config[nameof(UserConfig.UseSystemColorMode)]),
-                UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
-                UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
-                EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
-                EnableRootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]),
-                HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
-                AutomaticDecimalFormat = bool.Parse(_config[nameof(UserConfig.AutomaticDecimalFormat)]),
-                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
-                UseMarkDownOnSavedNotes = bool.Parse(_config[nameof(UserConfig.UseMarkDownOnSavedNotes)]),
-                UseThreeDecimalGasCost = bool.Parse(_config[nameof(UserConfig.UseThreeDecimalGasCost)]),
-                EnableAutoReminderRefresh = bool.Parse(_config[nameof(UserConfig.EnableAutoReminderRefresh)]),
-                EnableAutoOdometerInsert = bool.Parse(_config[nameof(UserConfig.EnableAutoOdometerInsert)]),
-                PreferredGasMileageUnit = _config[nameof(UserConfig.PreferredGasMileageUnit)],
-                PreferredGasUnit = _config[nameof(UserConfig.PreferredGasUnit)],
-                UserLanguage = _config[nameof(UserConfig.UserLanguage)],
-                HideSoldVehicles = bool.Parse(_config[nameof(UserConfig.HideSoldVehicles)]),
-                EnableShopSupplies = bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)]),
-                EnableExtraFieldColumns = bool.Parse(_config[nameof(UserConfig.EnableExtraFieldColumns)]),
-                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>(),
-                TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>(),
+                EnableCsvImports = CheckBool(CheckString(nameof(UserConfig.EnableCsvImports)), true),
+                UseDarkMode = CheckBool(CheckString(nameof(UserConfig.UseDarkMode))),
+                UseSystemColorMode = CheckBool(CheckString(nameof(UserConfig.UseSystemColorMode))),
+                UseMPG = CheckBool(CheckString(nameof(UserConfig.UseMPG)), true),
+                UseDescending = CheckBool(CheckString(nameof(UserConfig.UseDescending))),
+                EnableAuth = CheckBool(CheckString(nameof(UserConfig.EnableAuth))),
+                EnableRootUserOIDC = CheckBool(CheckString(nameof(UserConfig.EnableRootUserOIDC))),
+                HideZero = CheckBool(CheckString(nameof(UserConfig.HideZero))),
+                AutomaticDecimalFormat = CheckBool(CheckString(nameof(UserConfig.AutomaticDecimalFormat))),
+                UseUKMPG = CheckBool(CheckString(nameof(UserConfig.UseUKMPG))),
+                UseMarkDownOnSavedNotes = CheckBool(CheckString(nameof(UserConfig.UseMarkDownOnSavedNotes))),
+                UseThreeDecimalGasCost = CheckBool(CheckString(nameof(UserConfig.UseThreeDecimalGasCost)), true),
+                UseThreeDecimalGasConsumption = CheckBool(CheckString(nameof(UserConfig.UseThreeDecimalGasConsumption)), true),
+                EnableAutoReminderRefresh = CheckBool(CheckString(nameof(UserConfig.EnableAutoReminderRefresh))),
+                EnableAutoOdometerInsert = CheckBool(CheckString(nameof(UserConfig.EnableAutoOdometerInsert))),
+                PreferredGasMileageUnit = CheckString(nameof(UserConfig.PreferredGasMileageUnit)),
+                PreferredGasUnit = CheckString(nameof(UserConfig.PreferredGasUnit)),
+                UseUnitForFuelCost = CheckBool(CheckString(nameof(UserConfig.UseUnitForFuelCost))),
+                UserLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US"),
+                HideSoldVehicles = CheckBool(CheckString(nameof(UserConfig.HideSoldVehicles))),
+                EnableShopSupplies = CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies))),
+                EnableExtraFieldColumns = CheckBool(CheckString(nameof(UserConfig.EnableExtraFieldColumns))),
+                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>() ?? new UserConfig().VisibleTabs,
+                TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>() ?? new UserConfig().TabOrder,
                 UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
                 ReminderUrgencyConfig = _config.GetSection(nameof(UserConfig.ReminderUrgencyConfig)).Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(),
-                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)]),
-                DefaultReminderEmail = _config[nameof(UserConfig.DefaultReminderEmail)],
-                DisableRegistration = bool.Parse(_config[nameof(UserConfig.DisableRegistration)])
+                DefaultTab = (ImportMode)int.Parse(CheckString(nameof(UserConfig.DefaultTab), "8")),
+                DefaultReminderEmail = CheckString(nameof(UserConfig.DefaultReminderEmail)),
+                DisableRegistration = CheckBool(CheckString(nameof(UserConfig.DisableRegistration)))
             };
             int userId = 0;
             if (user != null)

Helper/MailHelper.cs

@@ -18,12 +18,12 @@ namespace CarCareTracker.Helper
         private readonly IFileHelper _fileHelper;
         private readonly ILogger<MailHelper> _logger;
         public MailHelper(
-            IConfiguration config,
+            IConfigHelper config,
             IFileHelper fileHelper,
             ILogger<MailHelper> logger
             ) {
             //load mailConfig from Configuration
-            mailConfig = config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
+            mailConfig = config.GetMailConfig();
             _fileHelper = fileHelper;
             _logger = logger;
         }
@@ -31,79 +31,79 @@ namespace CarCareTracker.Helper
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token)) {
-                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+                return OperationResponse.Failed("Email Address or Token is invalid");
             }
             string emailSubject = "Your Registration Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please complete your registration for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
+                return OperationResponse.Succeed("Email Sent!");
             } else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public OperationResponse NotifyUserForPasswordReset(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
             {
-                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+                return OperationResponse.Failed("Email Address or Token is invalid");
             }
             string emailSubject = "Your Password Reset Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please reset your password for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
+                return OperationResponse.Succeed("Email Sent!");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public OperationResponse NotifyUserForAccountUpdate(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
             {
-                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+                return OperationResponse.Failed("Email Address or Token is invalid");
             }
             string emailSubject = "Your User Account Update Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please update your account for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress}, emailSubject, emailBody);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
+                return OperationResponse.Succeed("Email Sent!");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (!emailAddresses.Any())
             {
-                return new OperationResponse { Success = false, Message = "No recipients could be found" };
+                return OperationResponse.Failed("No recipients could be found");
             }
             if (!reminders.Any())
             {
-                return new OperationResponse { Success = false, Message = "No reminders could be found" };
+                return OperationResponse.Failed("No reminders could be found");
             }
             //get email template, this file has to exist since it's a static file.
             var emailTemplatePath = _fileHelper.GetFullFilePath(StaticHelper.ReminderEmailTemplate);
@@ -123,14 +123,14 @@ namespace CarCareTracker.Helper
                 var result = SendEmail(emailAddresses, emailSubject, emailBody);
                 if (result)
                 {
-                    return new OperationResponse { Success = true, Message = "Email Sent!" };
+                    return OperationResponse.Succeed("Email Sent!");
                 } else
                 {
-                    return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                    return OperationResponse.Failed();
                 }
             } catch (Exception ex)
             {
-                return new OperationResponse { Success = false, Message = ex.Message };
+                return OperationResponse.Failed(ex.Message);
             }
         }
         private bool SendEmail(List<string> emailTo, string emailSubject, string emailBody) {

Helper/ReminderHelper.cs

@@ -79,6 +79,7 @@ namespace CarCareTracker.Helper
                     Description = reminder.Description,
                     Notes = reminder.Notes,
                     Metric = reminder.Metric,
+                    UserMetric = reminder.Metric,
                     IsRecurring = reminder.IsRecurring,
                     Tags = reminder.Tags
                 };

Helper/ReportHelper.cs

@@ -5,93 +5,166 @@ namespace CarCareTracker.Helper
 {
     public interface IReportHelper
     {
-        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0);
-        IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0);
-        IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0);
-        IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0);
-        IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0);
-        IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0);
+        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0, bool sortIntoYear = false);
     }
     public class ReportHelper: IReportHelper
     {
-        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 odometerRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = 0,
-                DistanceTraveled = x.Sum(y=>y.DistanceTraveled)
-            });
+                return odometerRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = 0,
+                    DistanceTraveled = x.Sum(y => y.DistanceTraveled)
+                });
+            } else
+            {
+                return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = 0,
+                    DistanceTraveled = x.Sum(y => y.DistanceTraveled)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 serviceRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return serviceRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return serviceRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return serviceRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 repairRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return repairRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return repairRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return repairRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 upgradeRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return upgradeRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return upgradeRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return upgradeRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 gasRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return gasRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 taxRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return taxRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return taxRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return taxRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
     }
 }

Helper/StaticHelper.cs

@@ -1,6 +1,7 @@
 using CarCareTracker.Models;
 using CsvHelper;
 using System.Globalization;
+using System.Text.Json;
 
 namespace CarCareTracker.Helper
 {
@@ -9,16 +10,16 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public static string VersionNumber = "1.4.0";
-        public static string DbName = "data/cartracker.db";
-        public static string UserConfigPath = "config/userConfig.json";
-        public static string AdditionalWidgetsPath = "data/widgets.html";
-        public static string GenericErrorMessage = "An error occurred, please try again later";
-        public static string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
-        public static string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
-        public static string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
-        public static string TranslationPath = "https://hargata.github.io/lubelog_translations";
-        public static string TranslationDirectoryPath = $"{TranslationPath}/directory.json";
+        public const string VersionNumber = "1.4.2";
+        public const string DbName = "data/cartracker.db";
+        public const string UserConfigPath = "config/userConfig.json";
+        public const string AdditionalWidgetsPath = "data/widgets.html";
+        public const string GenericErrorMessage = "An error occurred, please try again later";
+        public const string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
+        public const string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
+        public const string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
+        public const string TranslationPath = "https://hargata.github.io/lubelog_translations";
+        public const string TranslationDirectoryPath = $"{TranslationPath}/directory.json";
         public const string ReportNote = "Report generated by LubeLogger, a Free and Open Source Vehicle Maintenance Tracker - LubeLogger.com";
         public static string GetTitleCaseReminderUrgency(ReminderUrgency input)
         {
@@ -319,20 +320,22 @@ namespace CarCareTracker.Helper
                 Console.WriteLine("No Locale or Culture Configured for LubeLogger, Check Environment Variables");
             }
         }
-        public static async void NotifyAsync(string webhookURL, int vehicleId, string username, string action)
+        public static async void NotifyAsync(string webhookURL, WebHookPayload webHookPayload)
         {
             if (string.IsNullOrWhiteSpace(webhookURL))
             {
                 return;
             }
             var httpClient = new HttpClient();
-            var httpParams = new Dictionary<string, string>
-                {
-                { "vehicleId", vehicleId.ToString() },
-                     { "username", username },
-                     { "action", action },
-                };
-            httpClient.PostAsJsonAsync(webhookURL, httpParams);
+            if (webhookURL.StartsWith("discord://"))
+            {
+                webhookURL = webhookURL.Replace("discord://", "https://"); //cleanurl
+                //format to discord
+                httpClient.PostAsJsonAsync(webhookURL, DiscordWebHook.FromWebHookPayload(webHookPayload));
+            } else
+            {
+                httpClient.PostAsJsonAsync(webhookURL, webHookPayload);
+            }
         }
         public static string GetImportModeIcon(ImportMode importMode)
         {
@@ -601,6 +604,34 @@ namespace CarCareTracker.Helper
                 _csv.NextRecord();
             }
         }
+        public static string HideZeroCost(string input, bool hideZero, string decorations = "")
+        {
+            if (input == 0M.ToString("C2") && hideZero)
+            {
+                return "---";
+            } else
+            {
+                return string.IsNullOrWhiteSpace(decorations) ? input : $"{input}{decorations}";
+            }
+        }
+        public static string HideZeroCost(decimal input, bool hideZero, string decorations = "")
+        {
+            if (input == default && hideZero)
+            {
+                return "---";
+            }
+            else
+            {
+                return string.IsNullOrWhiteSpace(decorations) ? input.ToString("C2") : $"{input.ToString("C2")}{decorations}";
+            }
+        }
+        public static JsonSerializerOptions GetInvariantOption()
+        {
+            var serializerOption = new JsonSerializerOptions();
+            serializerOption.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+            serializerOption.Converters.Add(new InvariantConverter());
+            return serializerOption;
+        }
         public static void WriteGasRecordExportModel(CsvWriter _csv, IEnumerable<GasRecordExportModel> genericRecords)
         {
             var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();

Helper/TranslationHelper.cs

@@ -130,15 +130,15 @@ namespace CarCareTracker.Helper
             bool isDefaultLanguage = userLanguage == "en_US";
             if (isDefaultLanguage && !create)
             {
-                return new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." };
+                return OperationResponse.Failed("The translation file name en_US is reserved.");
             }
             if (string.IsNullOrWhiteSpace(userLanguage))
             {
-                return new OperationResponse { Success = false, Message = "File name is not provided." };
+                return OperationResponse.Failed("File name is not provided.");
             }
             if (!translations.Any())
             {
-                return new OperationResponse { Success = false, Message = "Translation has no data." };
+                return OperationResponse.Failed("Translation has no data.");
             }
             var translationFilePath = isDefaultLanguage ? _fileHelper.GetFullFilePath($"/defaults/en_US.json") : _fileHelper.GetFullFilePath($"/translations/{userLanguage}.json", false);
             try
@@ -159,12 +159,12 @@ namespace CarCareTracker.Helper
                     //write to file
                     File.WriteAllText(translationFilePath, JsonSerializer.Serialize(translations));
                 }
-                return new OperationResponse { Success = true, Message = "Translation Updated" };
+                return OperationResponse.Succeed("Translation Updated");
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public string ExportTranslation(Dictionary<string, string> translations)

Logic/LoginLogic.cs

@@ -71,13 +71,13 @@ namespace CarCareTracker.Logic
             var existingUser = _userData.GetUserRecordById(userId);
             if (existingUser.Id == default)
             {
-                return new OperationResponse { Success = false, Message = "Invalid user" };
+                return OperationResponse.Failed("Invalid user");
             }
             //validate user token
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != existingUser.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             if (!string.IsNullOrWhiteSpace(credentials.UserName) && existingUser.UserName != credentials.UserName)
             {
@@ -85,7 +85,7 @@ namespace CarCareTracker.Logic
                 var existingUserWithUserName = _userData.GetUserRecordByUserName(credentials.UserName);
                 if (existingUserWithUserName.Id != default)
                 {
-                    return new OperationResponse { Success = false, Message = "Username already taken" };
+                    return OperationResponse.Failed("Username already taken");
                 }
                 existingUser.UserName = credentials.UserName;
             }
@@ -95,7 +95,7 @@ namespace CarCareTracker.Logic
                 var existingUserWithEmailAddress = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
                 if (existingUserWithEmailAddress.Id != default)
                 {
-                    return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+                    return OperationResponse.Failed("A user with that email already exists");
                 }
                 existingUser.EmailAddress = credentials.EmailAddress;
             }
@@ -107,7 +107,7 @@ namespace CarCareTracker.Logic
             //delete token
             _tokenData.DeleteToken(existingToken.Id);
             var result = _userData.SaveUserRecord(existingUser);
-            return new OperationResponse { Success = result, Message = result ? "User Updated" : StaticHelper.GenericErrorMessage };
+            return OperationResponse.Conditional(result, "User Updated", string.Empty);
         }
         public OperationResponse RegisterOpenIdUser(LoginModel credentials)
         {
@@ -115,21 +115,21 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName))
             {
-                return new OperationResponse { Success = false, Message = "Username cannot be blank" };
+                return OperationResponse.Failed("Username cannot be blank");
             }
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "Username already taken" };
+                return OperationResponse.Failed("Username already taken");
             }
             var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (existingUserWithEmail.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+                return OperationResponse.Failed("A user with that email already exists");
             }
             _tokenData.DeleteToken(existingToken.Id);
             var newUser = new UserData()
@@ -141,11 +141,11 @@ namespace CarCareTracker.Logic
             var result = _userData.SaveUserRecord(newUser);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "You will be logged in briefly." };
+                return OperationResponse.Succeed("You will be logged in briefly.");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+                return OperationResponse.Failed("Something went wrong, please try again later.");
             }
         }
         //handles user registration
@@ -155,22 +155,22 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             //token is valid, check if username and password is acceptable and that username is unique.
             if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName) || string.IsNullOrWhiteSpace(credentials.Password))
             {
-                return new OperationResponse { Success = false, Message = "Neither username nor password can be blank" };
+                return OperationResponse.Failed("Neither username nor password can be blank");
             }
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "Username already taken" };
+                return OperationResponse.Failed("Username already taken");
             }
             var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (existingUserWithEmail.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+                return OperationResponse.Failed("A user with that email already exists");
             }
             //username is unique then we delete the token and create the user.
             _tokenData.DeleteToken(existingToken.Id);
@@ -183,11 +183,11 @@ namespace CarCareTracker.Logic
             var result = _userData.SaveUserRecord(newUser);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "You will be redirected to the login page briefly." };
+                return OperationResponse.Succeed("You will be redirected to the login page briefly.");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+                return OperationResponse.Failed();
             }
         }
         /// <summary>
@@ -205,24 +205,24 @@ namespace CarCareTracker.Logic
             }
             //for security purposes we want to always return true for this method.
             //otherwise someone can spam the reset password method to sniff out users.
-            return new OperationResponse { Success = true, Message = "If your user exists in the system you should receive an email shortly with instructions on how to proceed." };
+            return OperationResponse.Succeed("If your user exists in the system you should receive an email shortly with instructions on how to proceed.");
         }
         public OperationResponse ResetPasswordByUser(LoginModel credentials)
         {
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             if (string.IsNullOrWhiteSpace(credentials.Password))
             {
-                return new OperationResponse { Success = false, Message = "New Password cannot be blank" };
+                return OperationResponse.Failed("New Password cannot be blank");
             }
             //if token is valid.
             var existingUser = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (existingUser.Id == default)
             {
-                return new OperationResponse { Success = false, Message = "Unable to locate user" };
+                return OperationResponse.Failed("Unable to locate user");
             }
             existingUser.Password = GetHash(credentials.Password);
             var result = _userData.SaveUserRecord(existingUser);
@@ -230,10 +230,10 @@ namespace CarCareTracker.Logic
             _tokenData.DeleteToken(existingToken.Id);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Password resetted, you will be redirected to login page shortly." };
+                return OperationResponse.Succeed("Password resetted, you will be redirected to login page shortly.");
             } else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         /// <summary>
@@ -310,7 +310,7 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByEmailAddress(emailAddress);
             if (existingToken.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "There is an existing token tied to this email address" };
+                return OperationResponse.Failed("There is an existing token tied to this email address");
             }
             var token = new Token()
             {
@@ -323,16 +323,16 @@ namespace CarCareTracker.Logic
                 result = _mailHelper.NotifyUserForRegistration(emailAddress, token.Body).Success;
                 if (!result)
                 {
-                    return new OperationResponse { Success = false, Message = "Token Generated, but Email failed to send, please check your SMTP settings." };
+                    return OperationResponse.Failed("Token Generated, but Email failed to send, please check your SMTP settings.");
                 }
             }
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Token Generated!" };
+                return OperationResponse.Succeed("Token Generated!");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public bool DeleteUserToken(int tokenId)
@@ -351,18 +351,18 @@ namespace CarCareTracker.Logic
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id == default)
             {
-                return new OperationResponse { Success = false, Message = "Unable to find user" };
+                return OperationResponse.Failed("Unable to find user");
             }
             var newPassword = Guid.NewGuid().ToString().Substring(0, 8);
             existingUser.Password = GetHash(newPassword);
             var result = _userData.SaveUserRecord(existingUser);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = newPassword };
+                return OperationResponse.Succeed(newPassword);
             }
             else
             {
-                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+                return OperationResponse.Failed();
             }
         }
         #endregion

Logic/UserLogic.cs

@@ -51,16 +51,16 @@ namespace CarCareTracker.Logic
                 var userAccess = _userAccess.GetUserAccessByVehicleAndUserId(existingUser.Id, vehicleId);
                 if (userAccess != null)
                 {
-                    return new OperationResponse { Success = false, Message = "User is already a collaborator" };
+                    return OperationResponse.Failed("User is already a collaborator");
                 }
                 var result = AddUserAccessToVehicle(existingUser.Id, vehicleId);
                 if (result)
                 {
-                    return new OperationResponse { Success = true, Message = "Collaborator Added" };
+                    return OperationResponse.Succeed("Collaborator Added");
                 }
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
-            return new OperationResponse { Success = false, Message = $"Unable to find user {username} in the system" };
+            return OperationResponse.Failed($"Unable to find user {username} in the system");
         }
         public bool DeleteCollaboratorFromVehicle(int userId, int vehicleId)
         {

Logic/VehicleLogic.cs

@@ -1,4 +1,5 @@
-using CarCareTracker.External.Interfaces;
+using CarCareTracker.Controllers;
+using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
 
@@ -17,6 +18,8 @@ namespace CarCareTracker.Logic
         List<VehicleInfo> GetVehicleInfo(List<Vehicle> vehicles);
         List<ReminderRecordViewModel> GetReminders(List<Vehicle> vehicles, bool isCalendar);
         List<PlanRecord> GetPlans(List<Vehicle> vehicles, bool excludeDone);
+        bool UpdateRecurringTaxes(int vehicleId);
+        void RestoreSupplyRecordsByUsage(List<SupplyUsageHistory> supplyUsage, string usageDescription);
     }
     public class VehicleLogic: IVehicleLogic
     {
@@ -29,6 +32,10 @@ namespace CarCareTracker.Logic
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IPlanRecordDataAccess _planRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
+        private readonly IVehicleDataAccess _dataAccess;
+        private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
+        private readonly ILogger<VehicleLogic> _logger;
+
         public VehicleLogic(
             IServiceRecordDataAccess serviceRecordDataAccess,
             IGasRecordDataAccess gasRecordDataAccess,
@@ -38,7 +45,10 @@ namespace CarCareTracker.Logic
             IOdometerRecordDataAccess odometerRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IPlanRecordDataAccess planRecordDataAccess,
-            IReminderHelper reminderHelper
+            IReminderHelper reminderHelper,
+            IVehicleDataAccess dataAccess,
+            ISupplyRecordDataAccess supplyRecordDataAccess,
+            ILogger<VehicleLogic> logger
             ) {
             _serviceRecordDataAccess = serviceRecordDataAccess;
             _gasRecordDataAccess = gasRecordDataAccess;
@@ -49,6 +59,9 @@ namespace CarCareTracker.Logic
             _planRecordDataAccess = planRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _reminderHelper = reminderHelper;
+            _dataAccess = dataAccess;
+            _supplyRecordDataAccess = supplyRecordDataAccess;
+            _logger = logger;
         }
         public VehicleRecords GetVehicleRecords(int vehicleId)
         {
@@ -311,11 +324,102 @@ namespace CarCareTracker.Logic
                 }
                 if (vehiclePlans.Any())
                 {
-                    var convertedPlans = vehiclePlans.Select(x => new PlanRecord { Priority = x.Priority, Progress = x.Progress, Notes = x.Notes, RequisitionHistory = x.RequisitionHistory, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" });
+                    var convertedPlans = vehiclePlans.Select(x => new PlanRecord { ImportMode = x.ImportMode, Priority = x.Priority, Progress = x.Progress, Notes = x.Notes, RequisitionHistory = x.RequisitionHistory, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" });
                     plans.AddRange(convertedPlans);
                 }
             }
             return plans.OrderBy(x => x.Priority).ThenBy(x=>x.Progress).ToList();
         }
+        public bool UpdateRecurringTaxes(int vehicleId)
+        {
+            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
+            if (!string.IsNullOrWhiteSpace(vehicleData.SoldDate))
+            {
+                return false;
+            }
+            bool RecurringTaxIsOutdated(TaxRecord taxRecord)
+            {
+                var monthInterval = taxRecord.RecurringInterval != ReminderMonthInterval.Other ? (int)taxRecord.RecurringInterval : taxRecord.CustomMonthInterval;
+                return DateTime.Now > taxRecord.Date.AddMonths(monthInterval);
+            }
+            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            var outdatedRecurringFees = result.Where(x => x.IsRecurring && RecurringTaxIsOutdated(x));
+            if (outdatedRecurringFees.Any())
+            {
+                var success = false;
+                foreach (TaxRecord recurringFee in outdatedRecurringFees)
+                {
+                    var monthInterval = recurringFee.RecurringInterval != ReminderMonthInterval.Other ? (int)recurringFee.RecurringInterval : recurringFee.CustomMonthInterval;
+                    bool isOutdated = true;
+                    //update the original outdated tax record
+                    recurringFee.IsRecurring = false;
+                    _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
+                    //month multiplier for severely outdated monthly tax records.
+                    int monthMultiplier = 1;
+                    var originalDate = recurringFee.Date;
+                    while (isOutdated)
+                    {
+                        try
+                        {
+                            var nextDate = originalDate.AddMonths(monthInterval * monthMultiplier);
+                            monthMultiplier++;
+                            var nextnextDate = originalDate.AddMonths(monthInterval * monthMultiplier);
+                            recurringFee.Date = nextDate;
+                            recurringFee.Id = default; //new record
+                            recurringFee.IsRecurring = DateTime.Now <= nextnextDate;
+                            _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
+                            isOutdated = !recurringFee.IsRecurring;
+                            success = true;
+                        }
+                        catch (Exception)
+                        {
+                            isOutdated = false; //break out of loop if something broke.
+                            success = false;
+                        }
+                    }
+                }
+                return success;
+            }
+            return false; //no outdated recurring tax records.
+        }
+        public void RestoreSupplyRecordsByUsage(List<SupplyUsageHistory> supplyUsage, string usageDescription)
+        {
+            foreach (SupplyUsageHistory supply in supplyUsage)
+            {
+                try
+                {
+                    if (supply.Id == default)
+                    {
+                        continue; //no id, skip current supply.
+                    }
+                    var result = _supplyRecordDataAccess.GetSupplyRecordById(supply.Id);
+                    if (result != null && result.Id != default)
+                    {
+                        //supply exists, re-add the quantity and cost
+                        result.Quantity += supply.Quantity;
+                        result.Cost += supply.Cost;
+                        var requisitionRecord = new SupplyUsageHistory
+                        {
+                            Id = supply.Id,
+                            Date = DateTime.Now.Date,
+                            Description = $"Restored from {usageDescription}",
+                            Quantity = supply.Quantity,
+                            Cost = supply.Cost
+                        };
+                        result.RequisitionHistory.Add(requisitionRecord);
+                        //save
+                        _supplyRecordDataAccess.SaveSupplyRecordToVehicle(result);
+                    }
+                    else
+                    {
+                        _logger.LogError($"Unable to find supply with id {supply.Id}");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError($"Error restoring supply with id {supply.Id} : {ex.Message}");
+                }
+            }
+        }
     }
 }

MapProfile/ImportMappers.cs

@@ -8,18 +8,21 @@ namespace CarCareTracker.MapProfile
         public ImportMapper()
         {
             Map(m => m.Date).Name(["date", "fuelup_date"]);
+            Map(m => m.Day).Name(["day"]);
+            Map(m => m.Month).Name(["month"]);
+            Map(m => m.Year).Name(["year"]);
             Map(m => m.DateCreated).Name(["datecreated"]);
             Map(m => m.DateModified).Name(["datemodified"]);
             Map(m => m.InitialOdometer).Name(["initialodometer"]);
-            Map(m => m.Odometer).Name(["odometer"]);
-            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed"]);
+            Map(m => m.Odometer).Name(["odometer", "odo"]);
+            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed", "qty"]);
             Map(m => m.Cost).Name(["cost", "total cost", "totalcost", "total price"]);
             Map(m => m.Notes).Name("notes", "note");
             Map(m => m.Price).Name(["price"]);
-            Map(m => m.PartialFuelUp).Name(["partial_fuelup"]);
+            Map(m => m.PartialFuelUp).Name(["partial_fuelup", "partial tank", "partial_fill"]);
             Map(m => m.IsFillToFull).Name(["isfilltofull", "filled up"]);
             Map(m => m.Description).Name(["description"]);
-            Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup"]);
+            Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup", "missed fill up", "missed_fill"]);
             Map(m => m.PartSupplier).Name(["partsupplier"]);
             Map(m => m.PartQuantity).Name(["partquantity"]);
             Map(m => m.PartNumber).Name(["partnumber"]);

Middleware/Authen.cs

@@ -28,7 +28,7 @@ namespace CarCareTracker.Middleware
             _httpContext = httpContext;
             _dataProtector = securityProvider.CreateProtector("login");
             _loginLogic = loginLogic;
-            enableAuth = bool.Parse(configuration["EnableAuth"]);
+            enableAuth = bool.Parse(configuration["EnableAuth"] ?? "false");
         }
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {

Models/API/TypeConverter.cs

@@ -0,0 +1,138 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CarCareTracker.Models
+{
+    public class DummyType
+    {
+
+    }
+    class InvariantConverter : JsonConverter<DummyType>
+    {
+        public override void Write(Utf8JsonWriter writer, DummyType value, JsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+        public override DummyType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+    }
+    class FromDateOptional: JsonConverter<string>
+    {
+        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var tokenType = reader.TokenType;
+            if (tokenType == JsonTokenType.String)
+            {
+                return reader.GetString();
+            }
+            else if (tokenType == JsonTokenType.Number)
+            {
+                if (reader.TryGetInt64(out long intInput))
+                {
+                    return DateTimeOffset.FromUnixTimeSeconds(intInput).Date.ToShortDateString();
+                }
+            }
+            return reader.GetString();
+        }
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
+        {
+            if (options.Converters.Any(x => x.Type == typeof(DummyType)))
+            {
+                writer.WriteStringValue(DateTime.Parse(value).ToString("yyyy-MM-dd"));
+            }
+            else
+            {
+                writer.WriteStringValue(value);
+            }
+        }
+    }
+    class FromDecimalOptional : JsonConverter<string>
+    {
+        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var tokenType = reader.TokenType;
+            if (tokenType == JsonTokenType.String)
+            {
+                return reader.GetString();
+            }
+            else if (tokenType == JsonTokenType.Number) {
+                if (reader.TryGetDecimal(out decimal decimalInput))
+                {
+                    return decimalInput.ToString();
+                }
+            }
+            return reader.GetString();
+        }
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
+        {
+            if (options.Converters.Any(x=>x.Type == typeof(DummyType)))
+            {
+                writer.WriteNumberValue(decimal.Parse(value));
+            } else
+            {
+                writer.WriteStringValue(value);
+            }
+        }
+    }
+    class FromIntOptional : JsonConverter<string>
+    {
+        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var tokenType = reader.TokenType;
+            if (tokenType == JsonTokenType.String)
+            {
+                return reader.GetString();
+            }
+            else if (tokenType == JsonTokenType.Number)
+            {
+                if (reader.TryGetInt32(out int intInput))
+                {
+                    return intInput.ToString();
+                }
+            }
+            return reader.GetString();
+        }
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
+        {
+            if (options.Converters.Any(x => x.Type == typeof(DummyType)))
+            {
+                writer.WriteNumberValue(int.Parse(value));
+            }
+            else
+            {
+                writer.WriteStringValue(value);
+            }
+        }
+    }
+    class FromBoolOptional : JsonConverter<string>
+    {
+        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var tokenType = reader.TokenType;
+            switch (tokenType)
+            {
+                case JsonTokenType.String: 
+                    return reader.GetString();
+                case JsonTokenType.True:
+                    return "True";
+                case JsonTokenType.False:
+                    return "False";
+                default:
+                    return reader.GetString();
+            }
+        }
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
+        {
+            if (options.Converters.Any(x => x.Type == typeof(DummyType)))
+            {
+                writer.WriteBooleanValue(bool.Parse(value));
+            }
+            else
+            {
+                writer.WriteStringValue(value);
+            }
+        }
+    }
+}

Models/Collision/CollisionRecordInput.cs

@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public CollisionRecord ToCollisionRecord() { return new CollisionRecord { 
             Id = Id, 

Models/OperationResponse.cs

@@ -1,8 +1,33 @@
-namespace CarCareTracker.Models
+using CarCareTracker.Helper;
+
+namespace CarCareTracker.Models
 {
-    public class OperationResponse
+    public class OperationResponseBase
     {
         public bool Success { get; set; }
         public string Message { get; set; }
     }
+    public class OperationResponse: OperationResponseBase
+    {
+        public static OperationResponse Succeed(string message = "")
+        {
+            return new OperationResponse { Success = true, Message = message };
+        }
+        public static OperationResponse Failed(string message = "")
+        {
+            if (string.IsNullOrWhiteSpace(message))
+            {
+                message = StaticHelper.GenericErrorMessage;
+            }
+            return new OperationResponse { Success = false, Message = message};
+        }
+        public static OperationResponse Conditional(bool result, string successMessage = "", string errorMessage = "")
+        {
+            if (string.IsNullOrWhiteSpace(errorMessage))
+            {
+                errorMessage = StaticHelper.GenericErrorMessage;
+            }
+            return new OperationResponse { Success = result, Message = result ? successMessage : errorMessage };
+        }
+    }    
 }

Models/PlanRecord/PlanRecordInput.cs

@@ -17,6 +17,7 @@
         public decimal Cost { get; set; }
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public PlanRecord ToPlanRecord() { return new PlanRecord { 
             Id = Id, 

Models/Reminder/ReminderRecordViewModel.cs

@@ -9,6 +9,10 @@
         public string Description { get; set; }
         public string Notes { get; set; }
         /// <summary>
+        /// The metric the user selected to calculate the urgency of this reminder.
+        /// </summary>
+        public ReminderMetric UserMetric { get; set; } = ReminderMetric.Date;
+        /// <summary>
         /// Reason why this reminder is urgent
         /// </summary>
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;

Models/Report/CostDistanceTableForVehicle.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class CostDistanceTableForVehicle
+    {
+        public string DistanceUnit { get; set; } = "mi.";
+        public List<CostForVehicleByMonth> CostData { get; set; } = new List<CostForVehicleByMonth>();
+    }
+}

Models/Report/CostForVehicleByMonth.cs

@@ -2,9 +2,11 @@
 {
     public class CostForVehicleByMonth
     {
+        public int Year { get; set; }
         public int MonthId { get; set; }
         public string MonthName { get; set; }
         public decimal Cost { get; set; }
         public int DistanceTraveled { get; set; }
+        public decimal CostPerDistanceTraveled { get { if (DistanceTraveled > 0) { return Cost / DistanceTraveled; } else { return 0M; } } }
     }
 }

Models/Report/ReportParameter.cs

@@ -2,7 +2,12 @@
 {
     public class ReportParameter
     {
-       public List<string> VisibleColumns { get; set; } = new List<string>();
-       public List<string> ExtraFields { get; set; } = new List<string>();
+        public List<string> VisibleColumns { get; set; } = new List<string>();
+        public List<string> ExtraFields { get; set; } = new List<string>();
+        public TagFilter TagFilter { get; set; } = TagFilter.Exclude;
+        public List<string> Tags { get; set; } = new List<string>();
+        public bool FilterByDateRange { get; set; } = false;
+        public string StartDate { get; set; } = "";
+        public string EndDate { get; set; } = "";
     }
 }

Models/Report/VehicleHistoryViewModel.cs

@@ -17,5 +17,7 @@
         public decimal TotalDepreciation { get; set; }
         public decimal DepreciationPerDay { get; set; }
         public decimal DepreciationPerMile { get; set; }
+        public string StartDate { get; set; }
+        public string EndDate { get; set; }
     }
 }

Models/ServiceRecord/ServiceRecordInput.cs

@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public ServiceRecord ToServiceRecord() { return new ServiceRecord { 
             Id = Id, 

Models/Shared/ImportModel.cs

@@ -1,4 +1,6 @@
-namespace CarCareTracker.Models
+using System.Text.Json.Serialization;
+
+namespace CarCareTracker.Models
 {
     /// <summary>
     /// Import model used for importing records via CSV.
@@ -6,6 +8,9 @@
     public class ImportModel
     {
         public string Date { get; set; }
+        public string Day { get; set; }
+        public string Month { get; set; }
+        public string Year { get; set; }
         public string DateCreated { get; set; }
         public string DateModified { get; set; }
         public string Type { get; set; }
@@ -42,18 +47,28 @@
     }
     public class GenericRecordExportModel
     {
+        [JsonConverter(typeof(FromIntOptional))]
+        public string Id { get; set; }
+        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
+        [JsonConverter(typeof(FromIntOptional))]
         public string Odometer { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
+        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
         public string Tags { get; set; }
         public List<ExtraField> ExtraFields { get; set; }
     }
     public class OdometerRecordExportModel
     {
+        [JsonConverter(typeof(FromIntOptional))]
+        public string Id { get; set; }
+        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
+        [JsonConverter(typeof(FromIntOptional))]
         public string InitialOdometer { get; set; }
+        [JsonConverter(typeof(FromIntOptional))]
         public string Odometer { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
@@ -61,21 +76,34 @@
     }
     public class TaxRecordExportModel
     {
+        [JsonConverter(typeof(FromIntOptional))]
+        public string Id { get; set; }
+        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
+        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
         public string Tags { get; set; }
         public List<ExtraField> ExtraFields { get; set; }
     }
     public class GasRecordExportModel
     {
+        [JsonConverter(typeof(FromIntOptional))]
+        public string Id { get; set; }
+        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
+        [JsonConverter(typeof(FromIntOptional))]
         public string Odometer { get; set; }
+        [JsonConverter(typeof(FromDecimalOptional))]
         public string FuelConsumed { get; set; }
+        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
+        [JsonConverter(typeof(FromDecimalOptional))]
         public string FuelEconomy { get; set; }
+        [JsonConverter(typeof(FromBoolOptional))]
         public string IsFillToFull { get; set; }
+        [JsonConverter(typeof(FromBoolOptional))]
         public string MissedFuelUp { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
@@ -87,7 +115,9 @@
         public string Urgency { get; set; }
         public string Metric { get; set; }
         public string Notes { get; set; }
+        [JsonConverter(typeof(FromDateOptional))]
         public string DueDate { get; set; }
+        [JsonConverter(typeof(FromIntOptional))]
         public string DueOdometer { get; set; }
     }
     public class PlanRecordExportModel 

Models/Shared/WebHookPayload.cs

@@ -0,0 +1,253 @@
+using System.Text.Json.Serialization;
+
+namespace CarCareTracker.Models
+{
+    /// <summary>
+    /// WebHookPayload Object
+    /// </summary>
+    public class WebHookPayloadBase
+    {
+        public string Type { get; set; } = "";
+        public string Timestamp
+        {
+            get { return DateTime.UtcNow.ToString("O"); }
+        }
+        public Dictionary<string, string> Data { get; set; } = new Dictionary<string, string>();
+        /// <summary>
+        /// Legacy attributes below
+        /// </summary>
+        public string VehicleId { get; set; } = "";
+        public string Username { get; set; } = "";
+        public string Action { get; set; } = "";
+    }
+    public class DiscordWebHook
+    {
+        public string Username { get { return "LubeLogger"; } }
+        [JsonPropertyName("avatar_url")]
+        public string AvatarUrl { get { return "https://hargata.github.io/hargata/lubelogger_logo_small.png"; } }
+        public string Content { get; set; } = "";
+        public static DiscordWebHook FromWebHookPayload(WebHookPayload webHookPayload)
+        {
+            return new DiscordWebHook
+            {
+                Content = webHookPayload.Action,
+            };
+        } 
+    }
+    public class WebHookPayload: WebHookPayloadBase
+    {
+        private static string GetFriendlyActionType(string actionType)
+        {
+            var actionTypeParts = actionType.Split('.');
+            if (actionTypeParts.Length == 2)
+            {
+                var recordType = actionTypeParts[0];
+                var recordAction = actionTypeParts[1];
+                switch (recordAction)
+                {
+                    case "add":
+                        recordAction = "Added";
+                        break;
+                    case "update":
+                        recordAction = "Updated";
+                        break;
+                    case "delete":
+                        recordAction = "Deleted";
+                        break;
+                }
+                if (recordType.ToLower().Contains("record"))
+                {
+                    var cleanedRecordType = recordType.ToLower().Replace("record", "");
+                    cleanedRecordType = $"{char.ToUpper(cleanedRecordType[0])}{cleanedRecordType.Substring(1)} Record";
+                    recordType = cleanedRecordType;
+                } else
+                {
+                    recordType = $"{char.ToUpper(recordType[0])}{recordType.Substring(1)}";
+                }
+                return $"{recordAction} {recordType}";
+            } else if (actionTypeParts.Length == 3)
+            {
+                var recordType = actionTypeParts[0];
+                var recordAction = actionTypeParts[1];
+                var thirdPart = actionTypeParts[2];
+                switch (recordAction)
+                {
+                    case "add":
+                        recordAction = "Added";
+                        break;
+                    case "update":
+                        recordAction = "Updated";
+                        break;
+                    case "delete":
+                        recordAction = "Deleted";
+                        break;
+                }
+                if (recordType.ToLower().Contains("record"))
+                {
+                    var cleanedRecordType = recordType.ToLower().Replace("record", "");
+                    cleanedRecordType = $"{char.ToUpper(cleanedRecordType[0])}{cleanedRecordType.Substring(1)} Record";
+                    recordType = cleanedRecordType;
+                }
+                else
+                {
+                    recordType = $"{char.ToUpper(recordType[0])}{recordType.Substring(1)}";
+                }
+                if (thirdPart == "api")
+                {
+                    return $"{recordAction} {recordType} via API";
+                } else
+                {
+                    return $"{recordAction} {recordType}";
+                }
+            }
+            return actionType;
+        }
+        public static WebHookPayload FromGenericRecord(GenericRecord genericRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("description", genericRecord.Description);
+            payloadDictionary.Add("odometer", genericRecord.Mileage.ToString());
+            payloadDictionary.Add("vehicleId", genericRecord.VehicleId.ToString());
+            payloadDictionary.Add("cost", genericRecord.Cost.ToString("F2"));
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = genericRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {genericRecord.Description}"
+            };
+        }
+        public static WebHookPayload FromGasRecord(GasRecord gasRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("odometer", gasRecord.Mileage.ToString());
+            payloadDictionary.Add("fuelconsumed", gasRecord.Gallons.ToString());
+            payloadDictionary.Add("vehicleId", gasRecord.VehicleId.ToString());
+            payloadDictionary.Add("cost", gasRecord.Cost.ToString("F2"));
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = gasRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Odometer: {gasRecord.Mileage}"
+            };
+        }
+        public static WebHookPayload FromOdometerRecord(OdometerRecord odometerRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("initialodometer", odometerRecord.InitialMileage.ToString());
+            payloadDictionary.Add("odometer", odometerRecord.Mileage.ToString());
+            payloadDictionary.Add("vehicleId", odometerRecord.VehicleId.ToString());
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = odometerRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Odometer: {odometerRecord.Mileage}"
+            };
+        }
+        public static WebHookPayload FromTaxRecord(TaxRecord taxRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("description", taxRecord.Description);
+            payloadDictionary.Add("vehicleId", taxRecord.VehicleId.ToString());
+            payloadDictionary.Add("cost", taxRecord.Cost.ToString("F2"));
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = taxRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {taxRecord.Description}"
+            };
+        }
+        public static WebHookPayload FromPlanRecord(PlanRecord planRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("description", planRecord.Description);
+            payloadDictionary.Add("vehicleId", planRecord.VehicleId.ToString());
+            payloadDictionary.Add("cost", planRecord.Cost.ToString("F2"));
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = planRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {planRecord.Description}"
+            };
+        }
+        public static WebHookPayload FromReminderRecord(ReminderRecord reminderRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("description", reminderRecord.Description);
+            payloadDictionary.Add("vehicleId", reminderRecord.VehicleId.ToString());
+            payloadDictionary.Add("metric", reminderRecord.Metric.ToString());
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = reminderRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {reminderRecord.Description}"
+            };
+        }
+        public static WebHookPayload FromSupplyRecord(SupplyRecord supplyRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("description", supplyRecord.Description);
+            payloadDictionary.Add("vehicleId", supplyRecord.VehicleId.ToString());
+            payloadDictionary.Add("cost", supplyRecord.Cost.ToString("F2"));
+            payloadDictionary.Add("quantity", supplyRecord.Quantity.ToString("F2"));
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = supplyRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {supplyRecord.Description}"
+            };
+        }
+        public static WebHookPayload FromNoteRecord(Note noteRecord, string actionType, string userName)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            payloadDictionary.Add("description", noteRecord.Description);
+            payloadDictionary.Add("vehicleId", noteRecord.VehicleId.ToString());
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = noteRecord.VehicleId.ToString(),
+                Username = userName,
+                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {noteRecord.Description}"
+            };
+        }
+        public static WebHookPayload Generic(string payload, string actionType, string userName, string vehicleId)
+        {
+            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
+            payloadDictionary.Add("user", userName);
+            if (!string.IsNullOrWhiteSpace(payload))
+            {
+                payloadDictionary.Add("description", payload);
+            }
+            return new WebHookPayload
+            {
+                Type = actionType,
+                Data = payloadDictionary,
+                VehicleId = string.IsNullOrWhiteSpace(vehicleId) ? "N/A" : vehicleId,
+                Username = userName,
+                Action = string.IsNullOrWhiteSpace(payload) ? $"{userName} {GetFriendlyActionType(actionType)}" : $"{userName} {payload}"
+            };
+        }
+    }
+}

Models/Supply/SupplyRequisitionHistory.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyRequisitionHistory
+    {
+        public string CostInputId { get; set; }
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+    }
+}

Models/Supply/SupplyStore.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyStore
+    {
+        public string Tab { get; set; }
+        public bool AdditionalSupplies { get; set; }
+    }
+}

Models/Supply/SupplyUsageHistory.cs

@@ -1,6 +1,7 @@
 namespace CarCareTracker.Models
 {
     public class SupplyUsageHistory {
+        public int Id { get; set; }
         public DateTime Date { get; set; }
         public string PartNumber { get; set; }
         public string Description { get; set; }

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { 
             Id = Id, 

Models/UserConfig.cs

@@ -13,6 +13,7 @@
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
         public bool UseThreeDecimalGasCost { get; set; }
+        public bool UseThreeDecimalGasConsumption { get; set; }
         public bool UseMarkDownOnSavedNotes { get; set; }
         public bool EnableAutoReminderRefresh { get; set; }
         public bool EnableAutoOdometerInsert { get; set; }
@@ -22,6 +23,7 @@
         public bool AutomaticDecimalFormat { get; set; }
         public string PreferredGasUnit { get; set; } = string.Empty;
         public string PreferredGasMileageUnit { get; set; } = string.Empty;
+        public bool UseUnitForFuelCost { get; set; }
         public List<UserColumnPreference> UserColumnPreferences { get; set; } = new List<UserColumnPreference>();
         public ReminderUrgencyConfig ReminderUrgencyConfig { get; set; } = new ReminderUrgencyConfig();
         public string UserNameHash { get; set; }

Program.cs

@@ -65,8 +65,8 @@ builder.Services.AddSingleton<IFileHelper, FileHelper>();
 builder.Services.AddSingleton<IGasHelper, GasHelper>();
 builder.Services.AddSingleton<IReminderHelper, ReminderHelper>();
 builder.Services.AddSingleton<IReportHelper, ReportHelper>();
-builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<IConfigHelper, ConfigHelper>();
+builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
 
 //configure logic

Views/API/Index.cshtml

@@ -28,7 +28,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicles</code>
@@ -42,7 +42,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/info</code>
@@ -56,7 +56,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/adjustedodometer</code>
@@ -72,7 +72,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords</code>
@@ -86,7 +86,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords/latest</code>
@@ -100,7 +100,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        POST
+        <span class="badge bg-primary">POST</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords/add</code>
@@ -123,7 +123,43 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge text-bg-warning">PUT</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/odometerrecords/update</code>
+    </div>
+    <div class="col-3">
+        Updates Odometer Record
+    </div>
+    <div class="col-3">
+        Body(form-data): {<br />
+        Id - Id of Odometer Record<br />
+        date - Date to be entered<br />
+        initialOdometer - Initial Odometer reading<br />
+        odometer - Odometer reading<br />
+        notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge text-bg-danger">DELETE</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/odometerrecords/delete</code>
+    </div>
+    <div class="col-3">
+        Deletes Odometer Record
+    </div>
+    <div class="col-3">
+        Id - Id of Odometer Record
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/servicerecords</code>
@@ -137,7 +173,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        POST
+        <span class="badge bg-primary">POST</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/servicerecords/add</code>
@@ -161,7 +197,44 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge text-bg-warning">PUT</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/servicerecords/update</code>
+    </div>
+    <div class="col-3">
+        Updates Service Record
+    </div>
+    <div class="col-3">
+        Body(form-data): {<br />
+        Id - Id of Service Record<br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge text-bg-danger">DELETE</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/servicerecords/delete</code>
+    </div>
+    <div class="col-3">
+        Deletes Service Record
+    </div>
+    <div class="col-3">
+        Id - Id of Service Record
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/repairrecords</code>
@@ -175,7 +248,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        POST
+        <span class="badge bg-primary">POST</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/repairrecords/add</code>
@@ -199,7 +272,44 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge text-bg-warning">PUT</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/repairrecords/update</code>
+    </div>
+    <div class="col-3">
+        Updates Repair Record
+    </div>
+    <div class="col-3">
+        Body(form-data): {<br />
+        Id - Id of Repair Record <br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge text-bg-danger">DELETE</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/repairrecords/delete</code>
+    </div>
+    <div class="col-3">
+        Deletes Repair Record
+    </div>
+    <div class="col-3">
+        Id - Id of Repair Record
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/upgraderecords</code>
@@ -213,7 +323,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        POST
+        <span class="badge bg-primary">POST</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/upgraderecords/add</code>
@@ -237,7 +347,44 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge text-bg-warning">PUT</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/upgraderecords/update</code>
+    </div>
+    <div class="col-3">
+        Updates Upgrade Record
+    </div>
+    <div class="col-3">
+        Body(form-data): {<br />
+        Id - Id of Upgrade Record<br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge text-bg-danger">DELETE</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/upgraderecords/delete</code>
+    </div>
+    <div class="col-3">
+        Deletes Upgrade Record
+    </div>
+    <div class="col-3">
+        Id - Id of Upgrade Record
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/taxrecords</code>
@@ -251,7 +398,21 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        POST
+        <span class="badge bg-success">GET</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/taxrecords/check</code>
+    </div>
+    <div class="col-3">
+        Updates Outdated Recurring Tax Records
+    </div>
+    <div class="col-3">
+        No Params
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-primary">POST</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/taxrecords/add</code>
@@ -274,7 +435,43 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge text-bg-warning">PUT</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/taxrecords/update</code>
+    </div>
+    <div class="col-3">
+        Updates Tax Record
+    </div>
+    <div class="col-3">
+        Body(form-data): {<br />
+        Id - Id of Tax Record<br />
+        date - Date to be entered<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge text-bg-danger">DELETE</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/taxrecords/delete</code>
+    </div>
+    <div class="col-3">
+        Deletes Tax Record
+    </div>
+    <div class="col-3">
+        Id - Id of Tax Record
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/gasrecords</code>
@@ -292,7 +489,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        POST
+        <span class="badge bg-primary">POST</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/gasrecords/add</code>
@@ -318,7 +515,46 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        GET
+        <span class="badge text-bg-warning">PUT</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/gasrecords/update</code>
+    </div>
+    <div class="col-3">
+        Updates Gas Record
+    </div>
+    <div class="col-3">
+        Body(form-data): {<br />
+        Id - Id of Gas Record<br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        fuelConsumed - Fuel Consumed<br />
+        cost - Cost<br />
+        isFillToFull(bool) - Filled To Full<br />
+        missedFuelUp(bool) - Missed Fuel Up<br />
+        notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge text-bg-danger">DELETE</span>
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/gasrecords/delete</code>
+    </div>
+    <div class="col-3">
+        Deletes Gas Record
+    </div>
+    <div class="col-3">
+        Id - Id of Gas Record
+    </div>
+</div>
+<div class="row api-method">
+    <div class="col-1">
+        <span class="badge bg-success">GET</span>
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/reminders</code>
@@ -334,7 +570,7 @@
 {
     <div class="row api-method">
         <div class="col-1">
-            GET
+            <span class="badge bg-success">GET</span>
         </div>
         <div class="col-5 copyable">
             <code>/api/vehicle/reminders/send</code>
@@ -349,7 +585,7 @@
     </div>
     <div class="row api-method">
         <div class="col-1">
-            GET
+            <span class="badge bg-success">GET</span>
         </div>
         <div class="col-5 copyable">
             <code>/api/makebackup</code>
@@ -363,7 +599,7 @@
     </div>
     <div class="row api-method">
         <div class="col-1">
-            GET
+            <span class="badge bg-success">GET</span>
         </div>
         <div class="col-5 copyable">
             <code>/api/cleanup</code>

Views/Admin/Index.cshtml

@@ -2,12 +2,12 @@
 @{
     ViewData["Title"] = "Admin Panel";
 }
-@inject IConfiguration config;
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
     bool emailServerIsSetup = true;
-    var mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
-    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+    var mailConfig = config.GetMailConfig();
+    var userLanguage = config.GetServerLanguage();
     if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer))
     {
         emailServerIsSetup = false;

Views/Home/_GarageDisplay.cshtml

@@ -10,10 +10,10 @@
 @if (recordTags.Any())
 {
     <div class='row'>
-        <div class="d-flex align-items-center flex-wrap mt-4">
+        <div class="col-12 d-flex align-items-center flex-wrap mt-2 mb-2">
             @foreach (string recordTag in recordTags)
             {
-                <span onclick="filterGarage(this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
+                <span onclick="filterGarage(this)" class="user-select-none ms-1 me-1 mt-1 mb-1 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
             }
             <datalist id="tagList">
                 @foreach (string recordTag in recordTags)
@@ -24,13 +24,12 @@
         </div>
     </div>
 }
-<div class="row">
-    <div class="row gy-3 align-items-stretch vehiclesContainer">
+    <div class="row gy-3 align-items-stretch vehiclesContainer pb-2 @(recordTags.Any() ? "" : "mt-2")">
         @foreach (VehicleViewModel vehicle in Model)
         {
             @if (!(userConfig.HideSoldVehicles && !string.IsNullOrWhiteSpace(vehicle.SoldDate)))
             {
-                <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-4 user-select-none garage-item" ondragover="dragOver(event)" ondrop="dropBox(event, @vehicle.Id)" draggable="true" ondragstart="dragStart(event, @vehicle.Id)" data-tags='@string.Join(" ", vehicle.Tags)' id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="@await Html.PartialAsync("_VehicleExtraFields", vehicle.ExtraFields)" data-bs-placement="bottom" data-bs-trigger="manual" onmouseenter="loadPinnedNotes(@vehicle.Id)" ontouchstart="loadPinnedNotes(@vehicle.Id)" ontouchcancel="hidePinnedNotes(@vehicle.Id)" ontouchend="hidePinnedNotes(@vehicle.Id)" onmouseleave="hidePinnedNotes(@vehicle.Id)">
+                <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-6 user-select-none garage-item" ondragover="dragOver(event)" ondrop="dropBox(event, @vehicle.Id)" draggable="true" ondragstart="dragStart(event, @vehicle.Id)" data-tags='@string.Join(" ", vehicle.Tags)' id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="@await Html.PartialAsync("_VehicleExtraFields", vehicle.ExtraFields)" data-bs-placement="bottom" data-bs-trigger="manual" onmouseenter="loadPinnedNotes(@vehicle.Id)" ontouchstart="loadPinnedNotes(@vehicle.Id)" ontouchcancel="hidePinnedNotes(@vehicle.Id)" ontouchend="hidePinnedNotes(@vehicle.Id)" onmouseleave="hidePinnedNotes(@vehicle.Id)">
                     <div class="card" onclick="viewVehicle(@vehicle.Id)">
                         <img src="@vehicle.ImageLocation" style="height:145px; object-fit:scale-down; pointer-events:none; @(string.IsNullOrWhiteSpace(vehicle.SoldDate) ? "" : "filter: grayscale(100%);")" />
                         @if (!string.IsNullOrWhiteSpace(vehicle.SoldDate))
@@ -82,10 +81,9 @@
                 </div>
             }
         }
-        <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-4 garage-item-add">
+        <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-6 garage-item-add">
             <div class="card" onclick="showAddVehicleModal()" style="height:100%;">
                 <img src="/defaults/addnew_vehicle.png" style="object-fit:scale-down;height:100%;" />
             </div>
         </div>
-    </div>
-</div>
+    </div>

Views/Home/_Settings.cshtml

@@ -37,17 +37,29 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useDescending" checked="@Model.UserConfig.UseDescending">
             <label class="form-check-label" for="useDescending">@translator.Translate(userLanguage, "Sort lists in Descending Order(Newest to Oldest)")</label>
         </div>
-        <div class="form-check form-switch form-check-inline">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.UserConfig.HideZero">
-            <label class="form-check-label" for="hideZero">@translator.Translate(userLanguage, "Replace $0.00 Costs with ---")</label>
+        <div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.UserConfig.HideZero">
+                <label class="form-check-label" for="hideZero">@translator.Translate(userLanguage, "Replace $0.00 Costs with ---")</label>
+            </div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="automaticDecimalFormat" checked="@Model.UserConfig.AutomaticDecimalFormat">
+                <label class="form-check-label" for="automaticDecimalFormat">@translator.Translate(userLanguage, "Automatically Format Decimal Inputs")</label>
+            </div>
         </div>
-        <div class="form-check form-switch form-check-inline">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="automaticDecimalFormat" checked="@Model.UserConfig.AutomaticDecimalFormat">
-            <label class="form-check-label" for="automaticDecimalFormat">@translator.Translate(userLanguage, "Automatically Format Decimal Inputs")</label>
+        <div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UserConfig.UseThreeDecimalGasCost">
+                <label class="form-check-label" for="useThreeDecimal">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Cost")</label>
+            </div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useUnitForFuelCost" checked="@Model.UserConfig.UseUnitForFuelCost">
+                <label class="form-check-label" for="useUnitForFuelCost">@translator.Translate(userLanguage, "Default to Fuel Unit Cost")</label>
+            </div>
         </div>
         <div class="form-check form-switch">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UserConfig.UseThreeDecimalGasCost">
-            <label class="form-check-label" for="useThreeDecimal">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Cost")</label>
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimalGasConsumption" checked="@Model.UserConfig.UseThreeDecimalGasConsumption">
+            <label class="form-check-label" for="useThreeDecimalGasConsumption">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Consumption")</label>
         </div>
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useMarkDownOnSavedNotes" checked="@Model.UserConfig.UseMarkDownOnSavedNotes">
@@ -65,13 +77,15 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableExtraFieldColumns" checked="@Model.UserConfig.EnableExtraFieldColumns">
             <label class="form-check-label" for="enableExtraFieldColumns">@translator.Translate(userLanguage, "Show Extra Field Columns")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Enabling this may cause performance issues")</small></label>
         </div>
-        <div class="form-check form-switch">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
-            <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
-        </div>
-        <div class="form-check form-switch @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
-            <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
+        <div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
+                <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
+            </div>
+            <div class="form-check form-switch form-check-inline @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
+                <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
+            </div>
         </div>
         @if (User.IsInRole(nameof(UserData.IsRootUser)))
         {

Views/Migration/Index.cshtml

@@ -1,10 +1,10 @@
 @{
     ViewData["Title"] = "Database Migration";
 }
-@inject IConfiguration config;
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+    var userLanguage = config.GetServerLanguage();
 }
 @using CarCareTracker.Helper
 @model AdminViewModel

Views/Vehicle/Index.cshtml

@@ -173,4 +173,5 @@
         return { tab: "@userConfig.DefaultTab" };
     }
     bindWindowResize();
+    checkRecurringTaxes();
 </script>

Views/Vehicle/_Collaborators.cshtml

@@ -42,6 +42,7 @@
     function deleteCollaborator(userId, vehicleId) {
         $.post('/Vehicle/DeleteCollaboratorFromVehicle', {userId: userId, vehicleId: vehicleId}, function(data){
             if (data) {
+                successToast('Collaborator Removed');
                 refreshCollaborators();
             } else {
                 errorToast(genericErrorMessage());
@@ -68,6 +69,7 @@
                 var vehicleId = GetVehicleId().vehicleId;
                 $.post('/Vehicle/AddCollaboratorsToVehicle', { username: result.value.userName, vehicleId: vehicleId }, function (data) {
                     if (data.success) {
+                        successToast(data.message);
                         refreshCollaborators();
                     } else {
                         errorToast(data.message)

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -44,10 +44,7 @@
                     }
                     <label for="collisionRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="collisionRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the repair")" value="@(isNew ? "" : Model.Cost)">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "RepairRecord")
-                    }
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "RepairRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="collisionRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="collisionRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -126,7 +123,7 @@
         <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Repair Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "collisionRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_CollisionRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage,"Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('accident-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">               
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -125,7 +132,7 @@
                         <td class="col-2 col-xl-1 flex-grow-1 text-truncate" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(collisionRecord.Date)">@collisionRecord.Date.ToShortDateString()</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())</td>
                         <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description">@collisionRecord.Description</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(collisionRecord.Cost, hideZero))</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
@@ -145,12 +152,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -164,21 +173,23 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'ServiceRecord')">@translator.Translate(userLanguage, "Service Records")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'UpgradeRecord')">@translator.Translate(userLanguage, "Upgrades")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Service Records")</span><i class="bi bi-card-checklist"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Upgrades")</span><i class="bi bi-wrench-adjustable"></i></div></a></li>
     <li><hr class="dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="insertOdometer(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Create Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
+    <li><hr class="dropdown-divider"></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-active-multiple dropdown-divider"></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)">@translator.Translate(userLanguage, "Statistics")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Statistics")</span><i class="bi bi-graph-up"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_CostDistanceTableReport.cshtml

@@ -0,0 +1,94 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model CostDistanceTableForVehicle
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+    var hideZero = userConfig.HideZero;
+    var years = Model.CostData.Select(x => x.Year).OrderByDescending(x => x).Distinct();
+    var months = Model.CostData.OrderBy(x => x.MonthId).Select(x => x.MonthName).Distinct();
+}
+@if (Model.CostData.Any())
+{
+    <div>
+        <div class="modal-header">
+            <h5 class="modal-title">@(translator.Translate(userLanguage, "Vehicle Monthly Cost Breakdown"))</h5>
+            <button type="button" class="btn-close" onclick="hideDataTable()" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+            <div class="row">
+                <div class="col-12" style="overflow-x:auto;">
+                    <table class="table table-hover">
+                        <thead class="sticky-top">
+                            <tr class="d-flex">
+                                <th scope="col" style="cursor:pointer;" onclick="toggleBarChartTableData()" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@(translator.Translate(userLanguage, "Year"))</th>
+                                @foreach(int year in years){
+                                    if (year != default){
+                                        <th scope="col" style="cursor:pointer;" onclick="toggleBarChartTableData()" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@year</th>
+                                    }
+                                }
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach(string month in months){
+                                <tr class="d-flex">
+                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@month</td>
+                                    @foreach(int year in years){
+                                        if (year != default){
+                                            {
+                                                var dataToDisplay = Model.CostData.Where(x => x.Year == year && x.MonthName == month).FirstOrDefault();
+                                                if (dataToDisplay != null && dataToDisplay != default)
+                                                {
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(dataToDisplay.Cost.ToString("C2"), hideZero))</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@(dataToDisplay.DistanceTraveled != default ? $"{dataToDisplay.DistanceTraveled.ToString("N0")} {Model.DistanceUnit}" : "---")</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@(StaticHelper.HideZeroCost(dataToDisplay.CostPerDistanceTraveled.ToString("C2"), hideZero, $"/{Model.DistanceUnit}"))</td>
+                                                } else {
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero))</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@("---")</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@($"{StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero, $"/{Model.DistanceUnit}")}")</td>
+                                                }
+                                            }
+                                            }
+                                        }
+                                    </tr>
+                                }
+                        </tbody>
+                        <tfoot>
+                            <tr class="d-flex fw-bold">
+                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@(translator.Translate(userLanguage, "Total"))</td>
+                                @foreach (int year in years)
+                                {
+                                    if (year != default)
+                                    {
+                                        {
+                                            var yearDataToDisplay = Model.CostData.Where(x => x.Year == year);
+                                            if (yearDataToDisplay != null && yearDataToDisplay != default)
+                                            {
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(yearDataToDisplay.Sum(x => x.Cost).ToString("C2"), hideZero))</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@(yearDataToDisplay.Sum(x => x.DistanceTraveled) != default ? $"{yearDataToDisplay.Sum(x => x.DistanceTraveled).ToString("N0")} {Model.DistanceUnit}" : "---")</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@(StaticHelper.HideZeroCost(yearDataToDisplay.Sum(x => x.CostPerDistanceTraveled).ToString("C2"), hideZero, $"/{Model.DistanceUnit}"))</td>
+                                            }                              
+                                            else                           
+                                            {                              
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero))</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@("---")</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@($"{StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero)}")</td>
+                                            }
+                                        }
+                                    }
+                                }
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+else
+{
+    <div class="text-center">
+        <h4>@translator.Translate(userLanguage, "No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.")</h4>
+    </div>
+}

Views/Vehicle/_CostMakeUpReport.cshtml

@@ -16,28 +16,33 @@
             new Chart($("#pie-chart"), {
                 type: 'pie',
                 data: {
-                    labels: [decodeHTMLEntities('@translator.Translate(userLanguage, "Service Records")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Repairs")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Upgrades")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Tax")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Fuel")')],
+                    labels: [
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Service Records")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Repairs")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Upgrades")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Fuel")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Tax")')
+                    ],
                     datasets: [
                         {
                             label: decodeHTMLEntities('@translator.Translate(userLanguage, "Expenses by Type")'),
-                            backgroundColor: ["#003f5c", "#58508d", "#bc5090", "#ff6361", "#ffa600"],
+                            backgroundColor: ["#003f5c", "#58508d", "#bc5090", "#ffa600", "#ff6361" ],
                             data: [
                                 globalParseFloat('@Model.ServiceRecordSum'),
                                 globalParseFloat('@Model.CollisionRecordSum'),
                                 globalParseFloat('@Model.UpgradeRecordSum'),
-                                globalParseFloat('@Model.TaxRecordSum'),
-                                globalParseFloat('@Model.GasRecordSum')
+                                globalParseFloat('@Model.GasRecordSum'),
+                                globalParseFloat('@Model.TaxRecordSum')
                             ]
                         }
                     ]
                 },
                 options: {
-                    onClick: (e) => {
-                        showDataTable();
+                    onClick: (e, a, c) => {
+                        showDataTable(a);
+                    },
+                    onHover: (e, a, c) => {
+                        a.length > 0 ? c.canvas.style.cursor = 'pointer' : c.canvas.style.cursor = 'default';
                     },
                     plugins: {
                         legend: {

Views/Vehicle/_CostTableReport.cshtml

@@ -27,43 +27,45 @@
                             </tr>
                         </thead>
                         <tbody>
-                                <tr class="d-flex">
-                                    <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Service Records")</td>
-                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordPerDay == default ? "---" : Model.ServiceRecordPerDay.ToString("C2"))</td>
-                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordPerMile == default ? "---" :Model.ServiceRecordPerMile.ToString("C2"))</td>
-                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordSum == default ? "---" :Model.ServiceRecordSum.ToString("C2"))</td>
-                                </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Service Records")</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.ServiceRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.ServiceRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.ServiceRecordSum.ToString("C2"), hideZero))</td>
+                            </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Repairs")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordPerDay == default ? "---" :Model.CollisionRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordPerMile == default ? "---" :Model.CollisionRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordSum == default ? "---" :Model.CollisionRecordSum.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.CollisionRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.CollisionRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.CollisionRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Upgrades")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordPerDay == default ? "---" :Model.UpgradeRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordPerMile == default ? "---" :Model.UpgradeRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordSum == default ? "---" :Model.UpgradeRecordSum.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.UpgradeRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.UpgradeRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.UpgradeRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Fuel")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordPerDay == default ? "---" :Model.GasRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordPerMile == default ? "---" :Model.GasRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordSum == default ? "---" :Model.GasRecordSum.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.GasRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.GasRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.GasRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Taxes")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordPerDay == default ? "---" :Model.TaxRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordPerMile == default ? "---" : Model.TaxRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordSum == default ? "---" :Model.TaxRecordSum.ToString("C2"))</td>
-                            </tr>
-                            <tr class="d-flex">
-                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Total")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalPerDay == default ? "---" : Model.TotalPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalPerMile == default ? "---" : Model.TotalPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalCost == default ? "---" : Model.TotalCost.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TaxRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TaxRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TaxRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                         </tbody>
+                        <tfoot>
+                            <tr class="d-flex fw-bold">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Total")</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TotalPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TotalPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TotalCost.ToString("C2"), hideZero))</td>
+                            </tr>
+                        </tfoot>
                     </table>
                 </div>
             </div>

Views/Vehicle/_Gas.cshtml

@@ -10,7 +10,9 @@
     var useUKMPG = userConfig.UseUKMPG;
     var hideZero = userConfig.HideZero;
     var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var useThreeDecimalsConsumption = userConfig.UseThreeDecimalGasConsumption;
     var gasCostFormat = useThreeDecimals ? "C3" : "C2";
+    var gasConsumptionFormat = useThreeDecimalsConsumption ? "F3" : "F2";
     var userLanguage = userConfig.UserLanguage;
     var useKwh = Model.UseKwh;
     var useHours = Model.UseHours;
@@ -65,8 +67,9 @@
                     <span class="ms-2 badge bg-primary" id="minFuelMileageLabel">@($"{translator.Translate(userLanguage, "Min Fuel Economy")}: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
                     <span class="ms-2 badge bg-primary" id="maxFuelMileageLabel">@($"{translator.Translate(userLanguage, "Max Fuel Economy")}: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
                 }
+                <span class="ms-2 badge bg-success" id="totalDistanceLabel">@($"{translator.Translate(userLanguage, "Total Distance")}: {Model.GasRecords.Sum(x => x.DeltaMileage).ToString() ?? "0"} {distanceUnit}")</span>
             }
-            <span class="ms-2 badge bg-success">@($"{translator.Translate(userLanguage, "Total Fuel Consumed")}: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
+            <span class="ms-2 badge bg-success" id="totalFuelConsumedLabel">@($"{translator.Translate(userLanguage, "Total Fuel Consumed")}: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
             <span class="ms-2 badge bg-success" data-aggregate-type="sum">@($"{translator.Translate(userLanguage, "Total Cost")}: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
             @foreach (string recordTag in recordTags)
             {
@@ -93,6 +96,13 @@
                     <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                     <li><a class="dropdown-item" href="#" onclick="searchGasTableRows()">@translator.Translate(userLanguage, "Search")</a></li>
                     <li><hr class="dropdown-divider"></li>
+                    <li>
+                        <div class="list-group-item">
+                            <input class="btn-check" type="checkbox" id="chkSelectMode">
+                            <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                        </div>
+                    </li>
+                    <li><hr class="dropdown-divider"></li>
                     <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                     <li class="dropdown-item">
                         <div class="list-group-item">
@@ -191,8 +201,8 @@
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@gasRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditGasRecordModal,@gasRecord.Id)" data-tags='@string.Join(" ", gasRecord.Tags)'>
                         <td class="col-2 flex-grow-1 text-truncate" data-column="daterefueled">@gasRecord.Date</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@(gasRecord.Mileage == default ? "---" : gasRecord.Mileage.ToString())</td>
-                        <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="delta">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="delta" data-gas-type="totaldistance">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString(gasConsumptionFormat)</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="fueleconomy" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="unitcost" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
@@ -215,12 +225,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -234,15 +246,17 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleGasRecords(selectedRow)">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleGasRecords(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="insertOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Create Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
+    <li><hr class="dropdown-divider"></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {
@@ -257,5 +271,12 @@
     {
         @:convertGasConsumptionUnits(decodeHTMLEntities('@consumptionUnit'), decodeHTMLEntities('@preferredGasUnit'), false);
     }
-
+    function getGasModelData(){
+        return {
+            distanceUnit: decodeHTMLEntities('@distanceUnit'),
+            consumptionUnit: decodeHTMLEntities('@consumptionUnit'),
+            gasCostFormat: decodeHTMLEntities('@gasCostFormat'),
+            gasConsumptionFormat: decodeHTMLEntities('@gasConsumptionFormat')
+        }
+    }
 </script>

Views/Vehicle/_GasCostByMonthReport.cshtml

@@ -52,6 +52,12 @@
                         ]
                     },
                     options: {
+                        onClick: (e, a, c) => {
+                            showBarChartTable(a);
+                        },
+                        onHover: (e, a, c) => {
+                            a.length > 0 ? c.canvas.style.cursor = 'pointer' : c.canvas.style.cursor = 'default';
+                        },
                         plugins: {
                             title: {
                                 display: true,

Views/Vehicle/_GasModal.cshtml

@@ -7,9 +7,12 @@
     var useMPG = userConfig.UseMPG;
     var useUKMPG = userConfig.UseUKMPG;
     var userLanguage = userConfig.UserLanguage;
+    var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var useThreeDecimalsConsumption = userConfig.UseThreeDecimalGasConsumption;
     var useKwh = Model.UseKwh;
     var useHours = Model.UseHours;
     var isNew = Model.GasRecord.Id == 0;
+    var useUnitFuelCost = userConfig.UseUnitForFuelCost;
     string consumptionUnit;
     string distanceUnit;
     if (useKwh)
@@ -62,7 +65,7 @@
                         }
                     </div>
                     <label for="gasRecordGallons">@($"{translator.Translate(userLanguage, "Fuel Consumption")}({consumptionUnit})")</label>
-                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 3)" id="gasRecordGallons" class="form-control" placeholder="@translator.Translate(userLanguage,"Amount of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Gallons)">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimalsConsumption ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" id="gasRecordGallons" class="form-control" placeholder="@translator.Translate(userLanguage,"Amount of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Gallons)">
                     <div class="form-check form-switch">
                         <input class="form-check-input" type="checkbox" role="switch" id="gasIsFillToFull" checked="@Model.GasRecord.IsFillToFull">
                         <label class="form-check-label" for="gasIsFillToFull">@translator.Translate(userLanguage,"Is Filled To Full")</label>
@@ -75,17 +78,17 @@
                     @if (isNew)
                     {
                         <div class="input-group">
-                            <input type="text" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 3)" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                            <input type="text" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimals ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
                             <div class="input-group-text">
                                 <select class="form-select form-select-sm" id="gasCostType">
-                                    <option value="total">@translator.Translate(userLanguage,"Total")</option>
-                                    <option value="unit">@translator.Translate(userLanguage,"Unit")</option>
+                                    <!option @(useUnitFuelCost ? "" : "selected") value="total">@translator.Translate(userLanguage,"Total")</!option>
+                                    <!option @(useUnitFuelCost ? "selected" : "") value="unit">@translator.Translate(userLanguage,"Unit")</!option>
                                 </select>
                             </div>
                         </div>
                     } else
                     {
-                        <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 3)" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                        <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimals ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
                     }
                     <label for="gasRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="gasRecordTag">

Views/Vehicle/_GasRecordsModal.cshtml

@@ -5,6 +5,8 @@
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var useThreeDecimalsConsumption = userConfig.UseThreeDecimalGasConsumption;
 }
 <div class="modal-header">
     <h5 class="modal-title">@translator.Translate(userLanguage,"Edit Multiple Gas Records")</h5>
@@ -23,9 +25,9 @@
                     <label for="gasRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
                     <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="gasRecordConsumption">@translator.Translate(userLanguage, "Fuel Consumption")</label>
-                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 3)" id="gasRecordConsumption" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimalsConsumption ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" id="gasRecordConsumption" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="gasRecordCost">@translator.Translate(userLanguage, "Cost")</label>
-                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 3)" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimals ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="gasRecordTag">@translator.Translate(userLanguage, "Tags(use --- to clear all existing tags)")</label>
                     <select multiple class="form-select" id="gasRecordTag"></select>
                     @foreach (ExtraField field in Model.EditRecord.ExtraFields)

Views/Vehicle/_Notes.cshtml

@@ -6,6 +6,7 @@
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    var enableCsvImports = userConfig.EnableCsvImports;
 }
 <div class="row">
     <div class="d-flex justify-content-between">
@@ -23,7 +24,30 @@
             </datalist>
         </div>
         <div>
-            <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage,"Add Note")</button>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Note")</button>
+                    <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                        <span class="visually-hidden">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="searchTableRows('notes-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Note")</button>
+            }
         </div>
     </div>
 </div>
@@ -37,8 +61,8 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-3">@translator.Translate(userLanguage,"Description")</th>
-                    <th scope="col" class="col-9">@translator.Translate(userLanguage,"Note")</th>
+                    <th scope="col" class="col-4 col-md-3 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" class="col-8 col-md-9 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Note")</th>
                 </tr>
             </thead>
             <tbody>
@@ -47,20 +71,22 @@
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@note.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditNoteModal,@note.Id)" data-tags='@string.Join(" ", note.Tags)'>
                         @if (note.Pinned)
                         {
-                            <td class="col-3"><i class='bi bi-pin-fill me-2'></i>@note.Description</td>
+                            <td class="col-4 col-md-3 flex-grow-1 flex-shrink-1 text-truncate"><i class='bi bi-pin-fill me-2'></i>@note.Description</td>
                         } else
                         {
-                            <td class="col-3">@note.Description</td>
+                            <td class="col-4 col-md-3 flex-grow-1 flex-shrink-1 text-truncate">@note.Description</td>
                         }
-                        <td class="col-9 text-truncate" data-record-type="cost">@StaticHelper.TruncateStrings(note.NoteText, 100)</td>
+                        <td class="col-8 col-md-9 flex-grow-1 flex-shrink-1 text-truncate" data-record-type="cost">@StaticHelper.TruncateStrings(note.NoteText, 100)</td>
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -74,14 +100,14 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, true)">@translator.Translate(userLanguage, "Toggle Pin")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, true)">@translator.Translate(userLanguage, "Pin")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, false)">@translator.Translate(userLanguage, "Unpin")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, true)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Toggle Pin")</span><i class="bi bi-pin-angle-fill"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, true)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Pin")</span><i class="bi bi-pin-angle-fill"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, false)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Unpin")</span><i class="bi bi-pin-angle"></i></div></a></li>
     <li><hr class="dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'NoteRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'NoteRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'NoteRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
 </ul>

Views/Vehicle/_OdometerRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('odometer-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -145,12 +152,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -164,17 +173,17 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleOdometerRecords(selectedRow)">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleOdometerRecords(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple context-menu-deselect-all dropdown-divider"></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="recalculateDistance()">@translator.Translate(userLanguage, "Recalculate Distance")</a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="recalculateDistance()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Recalculate Distance")</span><i class="bi bi-plus-slash-minus"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_PlanRecordItem.cshtml

@@ -1,5 +1,5 @@
 @model PlanRecord
-<div class="taskCard @(Model.Progress == PlanProgress.Done ? "nodrag" : "") text-dark user-select-none mt-2 mb-2" draggable="@(Model.Progress == PlanProgress.Done ? "false" : "true")" ondragstart="dragStart(event, @Model.Id)" onclick="@(Model.Progress == PlanProgress.Done ? $"deletePlanRecord({Model.Id}, true)" : $"showEditPlanRecordModal({Model.Id})")">
+<div class="taskCard @(Model.Progress == PlanProgress.Done ? "nodrag" : "") text-dark user-select-none mt-2 mb-2" draggable="@(Model.Progress == PlanProgress.Done ? "false" : "true")" ondragstart="dragStart(event, @Model.Id)" onclick="@(Model.Progress == PlanProgress.Done ? $"deletePlanRecord({Model.Id}, true)" : $"showEditPlanRecordModal({Model.Id})")" oncontextmenu="@($"showPlanTableContextMenu(this, {Model.Id}, '{Model.Progress}')")" onmouseup="stopEvent()" ontouchstart="detectPlanItemLongTouch(this, @Model.Id, '@Model.Progress')" ontouchend="detectPlanItemTouchEndPremature(this)">
     <div class="card-body">
         <div class="row">
             <div class="col-12 col-lg-8 text-truncate">

Views/Vehicle/_PlanRecordModal.cshtml

@@ -21,10 +21,7 @@
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "PlanRecord")
-                    }
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "PlanRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -108,7 +105,7 @@
         <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Plan Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_PlanRecordTemplateEditModal.cshtml

@@ -21,7 +21,7 @@
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @await Html.PartialAsync("_SupplyStore", "PlanRecordTemplate")
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "PlanRecordTemplate", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -85,7 +85,7 @@
     <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
     <button type="button" class="btn btn-primary" onclick="savePlanRecordTemplate(true)">@translator.Translate(userLanguage, "Edit Plan Record Template")</button>
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_PlanRecords.cshtml

@@ -116,4 +116,16 @@
         <div class="modal-content" id="planRecordTemplateSupplyOrderModalContent">
         </div>
     </div>
-</div>
+</div>
+
+<ul class="table-context-menu dropdown-menu" style="display:none;">
+    <li><h6 class="dropdown-header context-menu-move move-header">@translator.Translate(userLanguage, "Move To")</h6></li>
+    <li><a class="dropdown-item context-menu-move move-planned" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Planned")</span><i class="bi bi-list-task"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-doing" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Doing")</span><i class="bi bi-tools"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-testing" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Testing")</span><i class="bi bi-eyeglasses"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-done" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Done")</span><i class="bi bi-check2-all"></i></div></a></li>
+    <li><hr class="context-menu-move move-header dropdown-divider"></li>
+    <li><a class="dropdown-item context-menu-move move-header context-menu-duplicate" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-header context-menu-duplicate-vehicle" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-header text-danger context-menu-delete" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
+</ul>

Views/Vehicle/_ReminderRecords.cshtml

@@ -7,6 +7,8 @@
     var userLanguage = userConfig.UserLanguage;
     var hasRefresh = Model.Where(x => (x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue) && x.IsRecurring).Any();
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
+    var enableCsvImports = userConfig.EnableCsvImports;
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.ReminderRecord);
 }
 <div class="row">
     <div class="d-flex justify-content-between">
@@ -28,7 +30,68 @@
             </datalist>
         </div>
         <div>
-            <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
+                    <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                        <span class="visually-hidden">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="searchTableRows('reminder-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='urgency' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Urgency" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Urgency">@translator.Translate(userLanguage, "Urgency")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='metric' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Metric" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Metric">@translator.Translate(userLanguage, "Metric")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Date">
+                                <label class="form-check-label stretched-link" for="chkCol_Date">@translator.Translate(userLanguage, "Date")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='odometer' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Odometer">
+                                <label class="form-check-label stretched-link" for="chkCol_Odometer">@translator.Translate(userLanguage, "Odometer")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Description" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Description">@translator.Translate(userLanguage, "Description")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Notes" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
+            }
         </div>
     </div>
 </div>
@@ -42,39 +105,42 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-1 text-truncate">@translator.Translate(userLanguage, "Urgency")</th>
-                    <th scope="col" class="col-2 text-truncate">@translator.Translate(userLanguage, "Metric")</th>
-                    <th scope="col" class="text-truncate @(hasRefresh ? "col-3 col-md-4" : "col-5")">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-2 col-md-3 text-truncate">@translator.Translate(userLanguage, "Notes")</th>
+                    <th scope="col" data-column="urgency" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Urgency")</th>
+                    <th scope="col" data-column="metric" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Metric")</th>
+                    <th scope="col" data-column="date" style="display:none;" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Date")</th>
+                    <th scope="col" data-column="odometer" style="display:none;"  class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Odometer")</th>
+                    <th scope="col" data-column="description" class="flex-grow-1 flex-shrink-1 text-truncate @(hasRefresh ? "col-3" : "col-4")">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" data-column="notes" class="flex-grow-1 flex-shrink-1 col-2 text-truncate">@translator.Translate(userLanguage, "Notes")</th>
                     @if (hasRefresh)
                     {
-                        <th scope="col" class="col-2 col-md-1 text-truncate">@translator.Translate(userLanguage, "Done")</th>
+                        <th scope="col" class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">@translator.Translate(userLanguage, "Done")</th>
                     }
-                    <th scope="col" class="col-2 col-md-1 text-truncate">@translator.Translate(userLanguage, "Delete")</th>
+                    <th scope="col" class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">@translator.Translate(userLanguage, "Delete")</th>
                 </tr>
             </thead>
             <tbody>
                 @foreach (ReminderRecordViewModel reminderRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@reminderRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditReminderRecordModal,@reminderRecord.Id)" data-tags='@string.Join(" ", reminderRecord.Tags)'>
-                        @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent)
-                        {
-                            <td class="col-1"><span class="text-danger d-inline-block d-md-none"><i class="bi bi-hourglass-split h3"></i></span><span class="badge text-bg-danger d-none d-md-inline-block">@translator.Translate(userLanguage, "Very Urgent")</span></td>
-                        }
-                        else if (reminderRecord.Urgency == ReminderUrgency.Urgent)
-                        {
-                            <td class="col-1"><span class="text-warning d-inline-block d-md-none"><i class="bi bi-hourglass-split h3"></i></span><span class="badge text-bg-warning d-none d-md-inline-block">@translator.Translate(userLanguage, "Urgent")</span></td>
-                        }
-                        else if (reminderRecord.Urgency == ReminderUrgency.PastDue)
-                        {
-                            <td class="col-1"><span class="text-secondary d-inline-block d-md-none"><i class="bi bi-hourglass-bottom h3"></i></span><span class="badge text-bg-secondary d-none d-md-inline-block">@translator.Translate(userLanguage, "Past Due")</span></td>
-                        }
-                        else
-                        {
-                            <td class="col-1"><span class="text-success d-inline-block d-md-none"><i class="bi bi-hourglass-top h3"></i></span><span class="badge text-bg-success d-none d-md-inline-block">@translator.Translate(userLanguage, "Not Urgent")</span></td>
-                        }
-                        <td class="col-2 text-truncate">
-                            <span data-column="metric" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true" data-bs-title="@($"<b><i class='bi bi-calendar-event me-2'></i></b>{reminderRecord.Date.ToShortDateString()}<b class='ms-2'><i class='bi bi-speedometer me-2'></i></b>{reminderRecord.Mileage}")">
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="urgency">
+                            @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent)
+                            {
+                                <span class="badge text-bg-danger">@translator.Translate(userLanguage, "Very Urgent")</span>
+                            }
+                            else if (reminderRecord.Urgency == ReminderUrgency.Urgent)
+                            {
+                                <span class="badge text-bg-warning">@translator.Translate(userLanguage, "Urgent")</span>
+                            }
+                            else if (reminderRecord.Urgency == ReminderUrgency.PastDue)
+                            {
+                                <span class="badge text-bg-secondary">@translator.Translate(userLanguage, "Past Due")</span>
+                            }
+                            else
+                            {
+                                <span class="badge text-bg-success">@translator.Translate(userLanguage, "Not Urgent")</span>
+                            }
+                        </td>
+                        <td class="col-2 text-truncate flex-grow-1 flex-shrink-1" data-column="metric">
                             @if (reminderRecord.Metric == ReminderMetric.Date)
                             {
                             @reminderRecord.Date.ToShortDateString()
@@ -87,30 +153,37 @@
                             {
                             @reminderRecord.Metric
                             }
-                            </span>
                         </td>
-                        <td class="text-truncate @(hasRefresh ? "col-3 col-md-4" : "col-5")" data-record-type='cost'>@reminderRecord.Description</td>
-                        <td class="col-2 col-md-3 text-truncate">@StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
+                        <td class="col-2 text-truncate flex-grow-1 flex-shrink-1" style="display:none;" data-column="date">
+                            @(reminderRecord.UserMetric == ReminderMetric.Both || reminderRecord.UserMetric == ReminderMetric.Date ? reminderRecord.Date.ToShortDateString() : "---")
+                        </td>
+                        <td class="col-2 text-truncate flex-grow-1 flex-shrink-1" style="display:none;" data-column="odometer">
+                            @(reminderRecord.UserMetric == ReminderMetric.Both || reminderRecord.UserMetric == ReminderMetric.Odometer ? reminderRecord.Mileage : "---")
+                        </td>
+                        <td data-column="description" class="flex-grow-1 flex-shrink-1 text-truncate @(hasRefresh ? "col-3" : "col-4")">@reminderRecord.Description</td>
+                        <td data-column="notes" class="flex-grow-1 flex-shrink-1 col-2 text-truncate">@StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
                         @if (hasRefresh)
                         {
-                            <td class="col-2 col-md-1 text-truncate">
+                            <td class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">
                                 @if((reminderRecord.Urgency == ReminderUrgency.VeryUrgent || reminderRecord.Urgency == ReminderUrgency.PastDue) && reminderRecord.IsRecurring)
                                 {
                                     <button type="button" class="btn btn-secondary" onclick="markDoneReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-check-lg"></i></button>
                                 }
                             </td>
                         }
-                        <td class="col-2 col-md-1 text-truncate">
+                        <td class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">
                             <button type="button" class="btn btn-danger" onclick="deleteReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-trash"></i></button>
                         </td>
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -122,16 +195,15 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ReminderRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'ReminderRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'ReminderRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
 </ul>
 
-<script>
-    if (!getDeviceIsTouchOnly()) {
-        $("[data-column='metric']").map((x, y) => new bootstrap.Tooltip(y));
-    }
-</script>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_ReportParameters.cshtml

@@ -6,16 +6,17 @@
     var userLanguage = userConfig.UserLanguage;
 }
 @model ReportParameter
-<div id="columnSelector">
+<h2 class="swal2-title mb-2">@translator.Translate(userLanguage, "Select Columns")</h2>
+<div id="columnSelector" style="max-height:50vh; overflow-y:auto;">
     <ul class="list-group">
-        @foreach(string column in Model.VisibleColumns)
+        @foreach (string column in Model.VisibleColumns)
         {
             <li class="list-group-item text-start">
                 <input class="form-check-input column-default" type="checkbox" value="@column" id="visibleColumn_@column" checked>
                 <label class="form-check-label stretched-link" for="visibleColumn_@column">@(translator.Translate(userLanguage, column == nameof(GenericReportModel.DataType) ? "Type" : column))</label>
             </li>
         }
-        @foreach(string extraField in Model.ExtraFields)
+        @foreach (string extraField in Model.ExtraFields)
         {
             <li class="list-group-item text-start">
                 <input class="form-check-input column-extrafield" type="checkbox" value="@extraField" id="extraField_@extraField">
@@ -23,4 +24,32 @@
             </li>
         }
     </ul>
-</div>
+</div>
+<div class="mt-2 mb-2">
+     <ul class="list-group">
+        <li class="list-group-item text-center" style="cursor:pointer;" onclick="showReportAdvancedParameters()">
+            @translator.Translate(userLanguage, "Advanced Filters")
+        </li>
+     </ul>
+</div>
+<h2 class="mb-2 report-advanced-parameters d-none">@translator.Translate(userLanguage, "Filter by Tags")</h2>
+<div class="text-start report-advanced-parameters d-none">
+    <select class="form-select mb-2" id="tagSelector">
+        <!option value="@TagFilter.Exclude">@translator.Translate(userLanguage, "Exclude Records with these Tags")</!option>
+        <!option value="@TagFilter.IncludeOnly">@translator.Translate(userLanguage, "Only Include Records with these Tags")</!option>
+    </select>
+    <select multiple id="tagSelectorInput"></select>
+</div>
+<h2 class="mb-2 report-advanced-parameters d-none">@translator.Translate(userLanguage, "Filter by Date Range")</h2>
+<div class="text-start report-advanced-parameters d-none">
+    <div class="form-check form-switch">
+        <input class="form-check-input" type="checkbox" role="switch" id="dateRangeSelector">
+        <label class="form-check-label" for="dateRangeSelector">@translator.Translate(userLanguage, "Filter by Date Range")</label>
+    </div>
+            <div class="input-group">
+                <span class="input-group-text">@translator.Translate(userLanguage, "From")</span>
+                <input type="text" id="dateRangeStartDate" class="form-control" placeholder="@translator.Translate(userLanguage,"Start Date")">
+                <span class="input-group-text">@translator.Translate(userLanguage, "To")</span>
+                <input type="text" id="dateRangeEndDate" class="form-control" placeholder="@translator.Translate(userLanguage,"End Date")">
+            </div>
+        </div>

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -44,10 +44,7 @@
                     }
                     <label for="serviceRecordCost">@translator.Translate(userLanguage,"Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="serviceRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the service")" value="@(isNew ? "" : Model.Cost)">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "ServiceRecord")
-                    }
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "ServiceRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="serviceRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="serviceRecordTag">
                         @foreach(string tag in Model.Tags)
@@ -126,7 +123,7 @@
         <button type="button" class="btn btn-primary" onclick="saveServiceRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Service Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "serviceRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_ServiceRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('servicerecord-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -125,7 +132,7 @@
                         <td class="col-2 col-xl-1 flex-grow-1 text-truncate" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(serviceRecord.Date)">@serviceRecord.Date.ToShortDateString()</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@(serviceRecord.Mileage == default ? "---" : serviceRecord.Mileage.ToString())</td>
                         <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description">@serviceRecord.Description</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(serviceRecord.Cost, hideZero))</td>
                         <td class="col-3 text-truncate flex-grow-1 flex-shrink-1" data-column="notes">@StaticHelper.TruncateStrings(serviceRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
@@ -143,12 +150,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -162,21 +171,23 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'ServiceRecord')">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'ServiceRecord', 'RepairRecord')">@translator.Translate(userLanguage, "Repairs")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'ServiceRecord', 'UpgradeRecord')">@translator.Translate(userLanguage, "Upgrades")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'ServiceRecord', 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Repairs")</span><i class="bi bi-exclamation-octagon"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'ServiceRecord', 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Upgrades")</span><i class="bi bi-wrench-adjustable"></i></div></a></li>
     <li><hr class="dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ServiceRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'ServiceRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'ServiceRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="insertOdometer(selectedRow, 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Create Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
+    <li><hr class="dropdown-divider"></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-active-multiple dropdown-divider"></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)">@translator.Translate(userLanguage, "Statistics")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Statistics")</span><i class="bi bi-graph-up"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'ServiceRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -102,7 +102,7 @@
         <button type="button" class="btn btn-primary" onclick="saveSupplyRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Supply Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "" })
 <script>
     var uploadedFiles = [];
     getUploadedFilesFromModel();

Views/Vehicle/_SupplyRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage,"Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('supply-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -141,7 +148,7 @@
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="supplier">@supplyRecord.PartSupplier</td>
                         <td class="col-2 flex-grow-1 col-xl-3 text-truncate" data-column="description">@supplyRecord.Description</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="quantity">@supplyRecord.Quantity</td>
-                        <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(supplyRecord.Cost, hideZero))</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(supplyRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
@@ -161,12 +168,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -180,12 +189,12 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'SupplyRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'SupplyRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'SupplyRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'SupplyRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'SupplyRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'SupplyRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_SupplyRequisitionHistory.cshtml

@@ -1,20 +1,46 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
 @inject ITranslationHelper translator
+@model SupplyRequisitionHistory
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    var showDelete = Model.RequisitionHistory.All(x => x.Id != default);
+    var showPartNumber = Model.RequisitionHistory.Any(x => !string.IsNullOrWhiteSpace(x.PartNumber));
 }
-@model List<SupplyUsageHistory>
 <script>
     var supplyUsageHistory = [];
+    var deletedSupplyUsageHistory = [];
+    function subtractFromCostInput(costToSubtract){
+        let costInputId = '@Model.CostInputId';
+        let costInput = $(`#${costInputId}`);
+        let newCostAmount = globalParseFloat(costInput.val()) - globalParseFloat(costToSubtract);
+        if (newCostAmount < 0){
+            newCostAmount = 0;
+        }
+        costInput.val(globalFloatToString(newCostAmount.toFixed(2)));
+    }
+    function deleteSupplyUsageHistory(supplyId, quantity, cost, supplyRow){
+        deletedSupplyUsageHistory.push({
+            id: decodeHTMLEntities(supplyId),
+            quantity: decodeHTMLEntities(quantity),
+            cost: decodeHTMLEntities(cost)
+        });
+        let supplyIndexToRemove = supplyUsageHistory.findIndex(x=>x.id == decodeHTMLEntities(supplyId) && x.quantity == decodeHTMLEntities(quantity) && x.cost == decodeHTMLEntities(cost));
+        if (supplyIndexToRemove > -1){
+            supplyUsageHistory.splice(supplyIndexToRemove, 1);
+        }
+        $(supplyRow).parents(".supply-row").remove();
+        //update cost input value
+        subtractFromCostInput(decodeHTMLEntities(cost));
+    }
 </script>
 <div id="supplyUsageHistoryModalContainer" class="d-none">
     <div class="modal-header">
         <h5 class="modal-title">@translator.Translate(userLanguage, "Supply Requisition History")</h5>
     </div>
     <div class="modal-body">
-        @if (Model.Any())
+        @if (Model.RequisitionHistory.Any())
         {
             <div class="row">
                 <div class="col-12" style="max-height:50vh; overflow-y:auto;">
@@ -22,35 +48,43 @@
                         <thead class="sticky-top">
                             <tr class="d-flex">
                                 <th scope="col" class="col-2">@translator.Translate(userLanguage, "Date")</th>
-                                @if(Model.Any(x=>!string.IsNullOrWhiteSpace(x.PartNumber))){
+                                @if(showPartNumber){
                                     <th scope="col" class="col-2">@translator.Translate(userLanguage, "Part Number")</th>
-                                    <th scope="col" class="col-4">@translator.Translate(userLanguage, "Description")</th>
+                                    <th scope="col" class="@(showDelete ? "col-2" : "col-4")">@translator.Translate(userLanguage, "Description")</th>
                                 } else
                                 {
-                                    <th scope="col" class="col-6">@translator.Translate(userLanguage, "Description")</th>
+                                    <th scope="col" class="@(showDelete ? "col-4" : "col-6")">@translator.Translate(userLanguage, "Description")</th>
                                 }
                                 <th scope="col" class="col-2">@translator.Translate(userLanguage, "Quantity")</th>
                                 <th scope="col" class="col-2">@translator.Translate(userLanguage, "Cost")</th>
+                                @if (showDelete){
+                                    <th scope="col" class="col-2">@translator.Translate(userLanguage, "Delete")</th>
+                                }
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach (SupplyUsageHistory usageHistory in Model)
+                            @foreach (SupplyUsageHistory usageHistory in Model.RequisitionHistory)
                             {
                                 <script>
-                                    supplyUsageHistory.push({ date: decodeHTMLEntities("@usageHistory.Date.ToShortDateString()"), partNumber: decodeHTMLEntities('@usageHistory.PartNumber'), description: decodeHTMLEntities("@usageHistory.Description"), quantity: decodeHTMLEntities("@usageHistory.Quantity.ToString("F")"), cost: decodeHTMLEntities("@usageHistory.Cost.ToString("F")") })
+                                    supplyUsageHistory.push({ id: decodeHTMLEntities("@usageHistory.Id"), date: decodeHTMLEntities("@usageHistory.Date.ToShortDateString()"), partNumber: decodeHTMLEntities('@usageHistory.PartNumber'), description: decodeHTMLEntities("@usageHistory.Description"), quantity: decodeHTMLEntities("@usageHistory.Quantity.ToString("F")"), cost: decodeHTMLEntities("@usageHistory.Cost.ToString("F")") })
                                 </script>
-                                <tr class="d-flex">
+                                <tr class="d-flex supply-row">
                                     <td class="col-2">@StaticHelper.TruncateStrings(usageHistory.Date.ToShortDateString())</td>
-                                    @if (!string.IsNullOrWhiteSpace(usageHistory.PartNumber))
+                                    @if (showPartNumber)
                                     {
                                         <td class="col-2 text-truncate">@StaticHelper.TruncateStrings(usageHistory.PartNumber)</td>
-                                        <td class="col-4 text-truncate">@StaticHelper.TruncateStrings(usageHistory.Description)</td>
+                                        <td class="@(showDelete ? "col-2" : "col-4") text-truncate">@StaticHelper.TruncateStrings(usageHistory.Description)</td>
                                     } else
                                     {
-                                        <td class="col-6 text-truncate">@StaticHelper.TruncateStrings(usageHistory.Description, 50)</td>
+                                        <td class="@(showDelete ? "col-4" : "col-6") text-truncate">@StaticHelper.TruncateStrings(usageHistory.Description, 50)</td>
                                     }
                                     <td class="col-2">@usageHistory.Quantity.ToString("F")</td>
                                     <td class="col-2">@usageHistory.Cost.ToString("C2")</td>
+                                    @if (showDelete){
+                                        <td class="col-2">
+                                            <button type="button" class="btn btn-danger" onclick="deleteSupplyUsageHistory('@usageHistory.Id.ToString()', '@usageHistory.Quantity.ToString("F")', '@usageHistory.Cost.ToString("F")', this)"><i class="bi bi-trash"></i></button>
+                                        </td>
+                                    }
                                 </tr>
                             }
                         </tbody>

Views/Vehicle/_SupplyStore.cshtml

@@ -5,36 +5,51 @@
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
 }
-@model string
+@model SupplyStore
 <div class="row">
     <div class="col-12">
-        <a onclick="showSuppliesModal()" class="btn btn-link">@translator.Translate(userLanguage,"Choose Supplies")</a>
+        <a onclick="showSuppliesModal()" class="btn btn-link">@translator.Translate(userLanguage,Model.AdditionalSupplies ? "Choose Additional Supplies" : "Choose Supplies")</a>
     </div>
 </div>
 <script>
     resetSuppliesModal();
     function GetCaller() {
-        return { tab: '@Model' };
+        return { 
+            tab: '@Model.Tab',
+            addToSum: @Model.AdditionalSupplies.ToString().ToLower()
+        };
     }
     function resetSuppliesModal() {
         $("#inputSuppliesModalContent").html("");
     }
+    function setCostInputWithSupplySum(selectedSum, input){
+        var addToSum = GetCaller().addToSum;
+        if (addToSum){
+            //sum of all requisitioned supplies
+            var currentSum = supplyUsageHistory.length > 0 ? supplyUsageHistory.map(x => globalParseFloat(x.cost)).reduce((a,b) => a + b) : 0;
+            selectedSum = globalParseFloat(selectedSum);
+            var newSum = currentSum + selectedSum;
+            input.val(globalFloatToString(newSum.toFixed(2)));
+        } else {
+            input.val(selectedSum);
+        }
+    }
     function selectSupplies() {
         var selectedSupplyResult = getSuppliesAndQuantity();
         var caller = GetCaller().tab;
         switch (caller) {
             case "ServiceRecord":
-                $('#serviceRecordCost').val(selectedSupplyResult.totalSum);
+                setCostInputWithSupplySum(selectedSupplyResult.totalSum, $('#serviceRecordCost'))
                 break;
             case "RepairRecord":
-                $('#collisionRecordCost').val(selectedSupplyResult.totalSum);
+                setCostInputWithSupplySum(selectedSupplyResult.totalSum, $('#collisionRecordCost'))
                 break;
             case "UpgradeRecord":
-                $('#upgradeRecordCost').val(selectedSupplyResult.totalSum);
+                setCostInputWithSupplySum(selectedSupplyResult.totalSum, $('#upgradeRecordCost'))
                 break;
             case "PlanRecord":
             case "PlanRecordTemplate":
-                $('#planRecordCost').val(selectedSupplyResult.totalSum);
+                setCostInputWithSupplySum(selectedSupplyResult.totalSum, $('#planRecordCost'))
                 break;
         }
         selectedSupplies = getSuppliesAndQuantity().selectedSupplies;

Views/Vehicle/_SupplyUsage.cshtml

@@ -17,7 +17,7 @@
         <div class="row">
             <div class="col-12" style="max-height:50vh; overflow-y:auto;" id="supplies-table">
                 <div class="alert alert-warning" role="alert">
-                    @translator.Translate(userLanguage,"Supplies are requisitioned immediately after the record is created and cannot be modified. If you have incorrectly entered the amount you needed you will need to correct it in the Supplies tab.")
+                    @translator.Translate(userLanguage,"Supplies are requisitioned immediately after the record is saved.")
                 </div>
                 <div class="d-flex align-items-center flex-wrap">
                     @foreach (string recordTag in recordTags)

Views/Vehicle/_TaxRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('tax-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -117,7 +124,7 @@
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@taxRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditTaxRecordModal,@taxRecord.Id)" data-tags='@string.Join(" ", taxRecord.Tags)'>
                         <td class="col-3 flex-grow-1 col-xl-1 text-truncate" data-column="date">@taxRecord.Date.ToShortDateString()</td>
                         <td class="col-4 flex-grow-1 col-xl-6 text-truncate" data-column="description">@taxRecord.Description</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(taxRecord.Cost, hideZero))</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(taxRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
@@ -137,12 +144,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -156,12 +165,12 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'TaxRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'TaxRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'TaxRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_UpgradeRecordModal.cshtml

@@ -44,10 +44,7 @@
                     }
                     <label for="upgradeRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="upgradeRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the upgrade/mods")" value="@(isNew ? "" : Model.Cost)">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "UpgradeRecord")
-                    }
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "UpgradeRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="upgradeRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="upgradeRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -126,7 +123,7 @@
         <button type="button" class="btn btn-primary" onclick="saveUpgradeRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Upgrade Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "upgradeRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_UpgradeRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('upgrade-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">               
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -125,7 +132,7 @@
                         <td class="col-2 flex-grow-1 col-xl-1 text-truncate" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(upgradeRecord.Date)">@upgradeRecord.Date.ToShortDateString()</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@(upgradeRecord.Mileage == default ? "---" : upgradeRecord.Mileage.ToString())</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 col-xl-4 text-truncate" data-column="description">@upgradeRecord.Description</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(upgradeRecord.Cost, hideZero))</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(upgradeRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
@@ -145,12 +152,14 @@
                         }
                     </tr>
                 }
+            </tbody>
+            <tfoot>
                 <tr class="d-flex">
                     <td class="col-12 showOnPrint lubelogger-report-banner">
                         @StaticHelper.ReportNote
                     </td>
                 </tr>
-            </tbody>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -163,21 +172,23 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'UpgradeRecord', 'ServiceRecord')">@translator.Translate(userLanguage, "Service Records")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'UpgradeRecord', 'RepairRecord')">@translator.Translate(userLanguage, "Repairs")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'UpgradeRecord', 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Service Records")</span><i class="bi bi-card-checklist"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'UpgradeRecord', 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Repairs")</span><i class="bi bi-exclamation-octagon"></i></div></a></li>
     <li><hr class="dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Duplicate To Vehicle")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="insertOdometer(selectedRow, 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Create Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
+    <li><hr class="dropdown-divider"></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-active-multiple dropdown-divider"></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)">@translator.Translate(userLanguage, "Statistics")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Statistics")</span><i class="bi bi-graph-up"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_VehicleHistory.cshtml

@@ -12,7 +12,19 @@
     <div class="row mt-2">
         <div class="d-flex">
             <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
-            <span class="display-6 ms-5">@translator.Translate(userLanguage, "Vehicle Maintenance Report")</span>
+            <div class="ms-5">
+                <span class="display-6">
+                    @translator.Translate(userLanguage, "Vehicle Maintenance Report")
+                </span>
+                @if (!string.IsNullOrWhiteSpace(Model.StartDate) && !string.IsNullOrWhiteSpace(Model.EndDate))
+                {
+                <br />
+                <span class="lead ms-2">
+                    @($"{@translator.Translate(userLanguage, "From")} {Model.StartDate} {@translator.Translate(userLanguage, "To")} {Model.EndDate}")
+                </span>
+                }
+            </div>
+            
         </div>
     </div>
     <hr />
@@ -145,7 +157,7 @@
                             <td class="col-2 text-truncate flex-grow-1 flex-shrink-1 @(Model.ReportParameters.VisibleColumns.Contains(nameof(GenericReportModel.Date)) ? "" : "d-none")">@reportData.Date.ToShortDateString()</td>
                             <td class="col-2 text-truncate flex-grow-1 flex-shrink-1 @(Model.ReportParameters.VisibleColumns.Contains(nameof(GenericReportModel.Odometer)) ? "" : "d-none")">@(reportData.Odometer == default ? "---" : reportData.Odometer.ToString("N0"))</td>
                             <td class="col-3 text-truncate flex-grow-1 flex-shrink-1 @(Model.ReportParameters.VisibleColumns.Contains(nameof(GenericReportModel.Description)) ? "" : "d-none")">@reportData.Description</td>
-                            <td class="col-2 text-truncate flex-grow-1 flex-shrink-1 @(Model.ReportParameters.VisibleColumns.Contains(nameof(GenericReportModel.Cost)) ? "" : "d-none")">@((hideZero && reportData.Cost == default) ? "---" : reportData.Cost.ToString("C"))</td>
+                            <td class="col-2 text-truncate flex-grow-1 flex-shrink-1 @(Model.ReportParameters.VisibleColumns.Contains(nameof(GenericReportModel.Cost)) ? "" : "d-none")">@(StaticHelper.HideZeroCost(reportData.Cost, hideZero))</td>
                             <td class="col-4 flex-grow-1 flex-shrink-1 text-wrap text-break @(Model.ReportParameters.VisibleColumns.Contains(nameof(GenericReportModel.Notes)) ? "" : "d-none")">@StaticHelper.TruncateStrings(reportData.Notes, 100)</td>
                             @foreach(string extraField in extraFields)
                             {
@@ -153,12 +165,14 @@
                             }
                         </tr>
                     }
+                </tbody>
+                <tfoot>
                     <tr class="d-flex">
                         <td class="col-12 showOnPrint lubelogger-report-banner">
                             @StaticHelper.ReportNote
                         </td>
                     </tr>
-                </tbody>
+                </tfoot>
             </table>
         </div>
     </div>

appsettings.json

@@ -15,17 +15,19 @@
   "DisableRegistration": false,
   "EnableRootUserOIDC": false,
   "HideZero": false,
-  "AutomaticDecimalFormat":  false,
+  "AutomaticDecimalFormat": false,
   "EnableAutoReminderRefresh": false,
   "EnableAutoOdometerInsert": false,
   "EnableShopSupplies": false,
   "EnableExtraFieldColumns": false,
   "UseUKMPG": false,
   "UseThreeDecimalGasCost": true,
+  "UseThreeDecimalGasConsumption": true,
   "UseMarkDownOnSavedNotes": false,
   "HideSoldVehicles": false,
   "PreferredGasMileageUnit": "",
   "UserColumnPreferences": [],
+  "UseUnitForFuelCost": false,
   "PreferredGasUnit": "",
   "UserLanguage": "en_US",
   "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],

wwwroot/css/site.css

@@ -211,6 +211,11 @@ html {
     }
 }
 
+.btn-check:checked + .dropdown-item, :not(.btn-check) + .dropdown-item:active {
+    color: #fff;
+    background-color: #0d6efd;
+}
+
 /*Media Queries*/
 @media (max-width: 576px) {
     .lubelogger-tab {
@@ -282,6 +287,25 @@ html {
 
 .table-context-menu {
     z-index: 1030;
+    box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.24);
+    position: absolute;
+}
+
+.table-context-menu > li > .dropdown-item:hover {
+   background-color: rgba(var(--bs-primary-rgb)) !important;
+   color: #fff !important;
+}
+
+html[data-bs-theme="dark"] .table-context-menu {
+    background-color: rgba(33, 37, 41, 0.7);
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+}
+
+html[data-bs-theme="light"] .table-context-menu {
+    background-color: rgba(255, 255, 255, 0.7);
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
 }
 
 input[type="file"] {

wwwroot/js/collisionrecord.js

@@ -149,6 +149,7 @@ function getAndValidateCollisionRecordValues() {
         addReminderRecord: addReminderRecord,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
+        deletedRequisitionHistory: deletedSupplyUsageHistory,
         reminderRecordId: recurringReminderRecordId,
         copySuppliesAttachment: copySuppliesAttachments
     }

wwwroot/js/gasrecord.js

@@ -267,6 +267,7 @@ function convertGasConsumptionUnits(currentUnit, destinationUnit, save) {
                 break;
         }
     }
+    updateMPGLabels();
 }
 
 function convertFuelMileageUnits(currentUnit, destinationUnit, save) {
@@ -281,31 +282,6 @@ function convertFuelMileageUnits(currentUnit, destinationUnit, save) {
                         elem.innerText = globalFloatToString(convertedAmount.toFixed(2));
                     }
                 });
-                //update labels up top.
-                if ($("#averageFuelMileageLabel").length > 0) {
-                    var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim());
-                    if (newAverage > 0) {
-                        newAverage = 100 / newAverage;
-                        var averageLabel = $("#averageFuelMileageLabel");
-                        averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`);
-                    }
-                }
-                if ($("#minFuelMileageLabel").length > 0) {
-                    var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim());
-                    if (newMin > 0) {
-                        newMin = 100 / newMin;
-                        var minLabel = $("#minFuelMileageLabel");
-                        minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`);
-                    }
-                }
-                if ($("#maxFuelMileageLabel").length > 0) {
-                    var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim());
-                    if (newMax > 0) {
-                        newMax = 100 / newMax;
-                        var maxLabel = $("#maxFuelMileageLabel");
-                        maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`);
-                    }
-                }
                 sender.text(sender.text().replace(sender.attr("data-unit"), "km/l"));
                 sender.attr("data-unit", "km/l");
                 if (save) { setDebounce(saveUserGasTabPreferences); }
@@ -321,36 +297,13 @@ function convertFuelMileageUnits(currentUnit, destinationUnit, save) {
                         elem.innerText = globalFloatToString(convertedAmount.toFixed(2));
                     }
                 });
-                if ($("#averageFuelMileageLabel").length > 0) {
-                    var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim());
-                    if (newAverage > 0) {
-                        newAverage = 100 / newAverage;
-                        var averageLabel = $("#averageFuelMileageLabel");
-                        averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`);
-                    }
-                }
-                if ($("#minFuelMileageLabel").length > 0) {
-                    var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim());
-                    if (newMin > 0) {
-                        newMin = 100 / newMin;
-                        var minLabel = $("#minFuelMileageLabel");
-                        minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`);
-                    }
-                }
-                if ($("#maxFuelMileageLabel").length > 0) {
-                    var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim());
-                    if (newMax > 0) {
-                        newMax = 100 / newMax;
-                        var maxLabel = $("#maxFuelMileageLabel");
-                        maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`);
-                    }
-                }
                 sender.text(sender.text().replace(sender.attr("data-unit"), "l/100km"));
                 sender.attr("data-unit", "l/100km");
                 if (save) { setDebounce(saveUserGasTabPreferences); }
                 break;
         }
     }
+    updateMPGLabels();
 }
 function toggleGasFilter(sender) {
     filterTable('gas-tab-pane', sender);
@@ -360,13 +313,20 @@ function updateMPGLabels() {
     var averageLabel = $("#averageFuelMileageLabel");
     var minLabel = $("#minFuelMileageLabel");
     var maxLabel = $("#maxFuelMileageLabel");
-    if (averageLabel.length > 0 && minLabel.length > 0 && maxLabel.length > 0) {
+    var totalConsumedLabel = $("#totalFuelConsumedLabel");
+    var totalDistanceLabel = $("#totalDistanceLabel");
+    if (averageLabel.length > 0 && minLabel.length > 0 && maxLabel.length > 0 && totalConsumedLabel.length > 0 && totalDistanceLabel.length > 0) {
         var rowsToAggregate = $("[data-aggregated='true']").parent(":not('.override-hide')");
+        var rowsUnaggregated = $("[data-aggregated='false']").parent(":not('.override-hide')");
         var rowMPG = rowsToAggregate.children('[data-gas-type="fueleconomy"]').toArray().map(x => globalParseFloat(x.textContent));
         var maxMPG = rowMPG.length > 0 ? rowMPG.reduce((a, b) => a > b ? a : b) : 0;
         var minMPG = rowMPG.length > 0 ? rowMPG.filter(x=>x>0).reduce((a, b) => a < b ? a : b) : 0;
         var totalMilesTraveled = rowMPG.length > 0 ? rowsToAggregate.children('[data-gas-type="mileage"]').toArray().map(x => globalParseFloat($(x).attr("data-gas-aggregate"))).reduce((a, b) => a + b) : 0;
-        var totalGasConsumed = rowMPG.length > 0 ? rowsToAggregate.children('[data-gas-type="consumption"]').toArray().map(x => globalParseFloat($(x).attr("data-gas-aggregate"))).reduce((a, b) => a + b) : 0;
+        var totalGasConsumed = rowMPG.length > 0 ? rowsToAggregate.children('[data-gas-type="consumption"]').toArray().map(x => globalParseFloat(x.textContent)).reduce((a, b) => a + b) : 0;
+        var totalUnaggregatedGasConsumed = rowsUnaggregated.length > 0 ? rowsUnaggregated.children('[data-gas-type="consumption"]').toArray().map(x => globalParseFloat(x.textContent)).reduce((a, b) => a + b) : 0;
+        var totalMilesTraveledUnaggregated = rowsUnaggregated.length > 0 ? rowsUnaggregated.children('[data-gas-type="mileage"]').toArray().map(x => globalParseFloat($(x).attr("data-gas-aggregate"))).reduce((a, b) => a + b) : 0;
+        var fullGasConsumed = totalGasConsumed + totalUnaggregatedGasConsumed;
+        var fullDistanceTraveled = totalMilesTraveled + totalMilesTraveledUnaggregated;
         if (totalGasConsumed > 0) {
             var averageMPG = totalMilesTraveled / totalGasConsumed;
             if (!getGlobalConfig().useMPG && $("[data-gas='fueleconomy']").attr("data-unit") != 'km/l' && averageMPG > 0) {
@@ -374,7 +334,17 @@ function updateMPGLabels() {
             }
             averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(averageMPG.toFixed(2))}`);
         } else {
-            averageLabel.text(`${averageLabel.text().split(':')[0]}: 0.00`);
+            averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString('0.00')}`);
+        }
+        if (fullDistanceTraveled > 0) {
+            totalDistanceLabel.text(`${totalDistanceLabel.text().split(':')[0]}: ${fullDistanceTraveled} ${getGasModelData().distanceUnit}`);
+        } else {
+            totalDistanceLabel.text(`${totalDistanceLabel.text().split(':')[0]}: 0 ${getGasModelData().distanceUnit}`);
+        }
+        if (fullGasConsumed > 0) {
+            totalConsumedLabel.text(`${totalConsumedLabel.text().split(':')[0]}: ${globalFloatToString(fullGasConsumed.toFixed(2))}`);
+        } else {
+            totalConsumedLabel.text(`${totalConsumedLabel.text().split(':')[0]}: ${globalFloatToString('0.00')}`);
         }
         if (!getGlobalConfig().useMPG && $("[data-gas='fueleconomy']").attr("data-unit") != 'km/l') {
             maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(minMPG.toFixed(2))}`);
@@ -455,6 +425,9 @@ function searchGasTableRows() {
     });
 }
 function editMultipleGasRecords(ids) {
+    if (ids.length < 2) {
+        return;
+    }
     $.post('/Vehicle/GetGasRecordsEditModal', { recordIds: ids }, function (data) {
         if (data) {
             $("#gasRecordModalContent").html(data);

wwwroot/js/odometerrecord.js

@@ -152,6 +152,9 @@ function recalculateDistance() {
 }
 
 function editMultipleOdometerRecords(ids) {
+    if (ids.length < 2) {
+        return;
+    }
     $.post('/Vehicle/GetOdometerRecordsEditModal', { recordIds: ids }, function (data) {
         if (data) {
             $("#odometerRecordModalContent").html(data);

wwwroot/js/planrecord.js

@@ -250,6 +250,7 @@ function getAndValidatePlanRecordValues() {
         importMode: planType,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
+        deletedRequisitionHistory: deletedSupplyUsageHistory,
         reminderRecordId: reminderRecordId,
         copySuppliesAttachment: copySuppliesAttachments
     }
@@ -268,12 +269,16 @@ function dragStart(event, planRecordId) {
 }
 function dragOver(event) {
     event.preventDefault();
+    if (planTouchTimer) {
+        clearTimeout(planTouchTimer);
+        planTouchTimer = null;
+    }
 }
 function dropBox(event, newProgress) {
-    if ($(event.target).hasClass("swimlane")) {
-        if (dragged.parentElement != event.target && event.target != dragged) {
-            updatePlanRecordProgress(newProgress);
-        }
+    var targetSwimLane = $(event.target).hasClass("swimlane") ? event.target : $(event.target).parents(".swimlane")[0];
+    var draggedSwimLane = $(dragged).parents(".swimlane")[0];
+    if (targetSwimLane != draggedSwimLane) {
+        updatePlanRecordProgress(newProgress);
     }
     event.preventDefault();
 }
@@ -348,4 +353,105 @@ function orderPlanSupplies(planRecordTemplateId, closeSwal) {
 function hideOrderSupplyModal() {
     $("#planRecordTemplateSupplyOrderModal").modal('hide');
     showPlanRecordTemplatesModal();
+}
+function configurePlanTableContextMenu(planRecordId, currentSwimLane) {
+    //clear any bound actions
+    $(".context-menu-move").off('click');
+    //bind context menu actions
+    $(".context-menu-delete").on('click', () => {
+        deletePlanRecord(planRecordId, true);
+    });
+    let planRecordIdArray = [planRecordId];
+    $(".context-menu-duplicate").on('click', () => {
+        duplicateRecords(planRecordIdArray, 'PlanRecord');
+    });
+    $(".context-menu-duplicate-vehicle").on('click', () => {
+        duplicateRecordsToOtherVehicles(planRecordIdArray, 'PlanRecord');
+    });
+    $(".context-menu-move.move-planned").on('click', () => {
+        draggedId = planRecordId;
+        updatePlanRecordProgress('Backlog');
+        draggedId = 0;
+    });
+    $(".context-menu-move.move-doing").on('click', () => {
+        draggedId = planRecordId;
+        updatePlanRecordProgress('InProgress');
+    });
+    $(".context-menu-move.move-testing").on('click', () => {
+        draggedId = planRecordId;
+        updatePlanRecordProgress('Testing');
+    });
+    $(".context-menu-move.move-done").on('click', () => {
+        draggedId = planRecordId;
+        updatePlanRecordProgress('Done');
+    });
+    //hide all move buttons
+    $(".context-menu-move").hide();
+    $(".context-menu-delete").show(); //delete is always visible.
+    switch (currentSwimLane) {
+        case 'Backlog':
+            $(".context-menu-move.move-header").show();
+            $(".context-menu-move.move-doing").show();
+            $(".context-menu-move.move-testing").show();
+            $(".context-menu-move.move-done").show();
+            break;
+        case 'InProgress':
+            $(".context-menu-move.move-header").show();
+            $(".context-menu-move.move-planned").show();
+            $(".context-menu-move.move-testing").show();
+            $(".context-menu-move.move-done").show();
+            break;
+        case 'Testing':
+            $(".context-menu-move.move-header").show();
+            $(".context-menu-move.move-planned").show();
+            $(".context-menu-move.move-doing").show();
+            $(".context-menu-move.move-done").show();
+            break;
+        case 'Done':
+            break;
+    }
+}
+function showPlanTableContextMenu(e, planRecordId, currentSwimLane) {
+    if (event != undefined) {
+        event.preventDefault();
+    }
+    if (getDeviceIsTouchOnly()) {
+        return;
+    }
+    if (planRecordId == 0) {
+        return;
+    }
+    $(".table-context-menu").fadeIn("fast");
+    $(".table-context-menu").css({
+        left: getMenuPosition(event.clientX, 'width', 'scrollLeft'),
+        top: getMenuPosition(event.clientY, 'height', 'scrollTop')
+    });
+    configurePlanTableContextMenu(planRecordId, currentSwimLane);
+}
+function showPlanTableContextMenuForMobile(e, xPosition, yPosition, planRecordId, currentSwimLane) {
+    $(".table-context-menu").fadeIn("fast");
+    $(".table-context-menu").css({
+        left: getMenuPosition(xPosition, 'width', 'scrollLeft'),
+        top: getMenuPosition(yPosition, 'height', 'scrollTop')
+    });
+    configurePlanTableContextMenu(planRecordId, currentSwimLane);
+    if (planTouchTimer) {
+        clearTimeout(planTouchTimer);
+        planTouchTimer = null;
+    }
+}
+var planTouchTimer;
+var planTouchDuration = 3000;
+function detectPlanItemLongTouch(sender, planRecordId, currentSwimLane) {
+    var touchX = event.touches[0].clientX;
+    var touchY = event.touches[0].clientY;
+    if (!planTouchTimer) {
+        planTouchTimer = setTimeout(function () { showPlanTableContextMenuForMobile(sender, touchX, touchY, planRecordId, currentSwimLane); detectPlanItemTouchEndPremature(sender); }, planTouchDuration);
+    }
+}
+function detectPlanItemTouchEndPremature(sender) {
+    if (planTouchTimer) {
+        clearTimeout(planTouchTimer);
+        planTouchTimer = null;
+    }
 }

wwwroot/js/reports.js

@@ -4,6 +4,11 @@
 function getAndValidateSelectedColumns() {
     var reportVisibleColumns = [];
     var reportExtraFields = [];
+    var tagFilterMode = $("#tagSelector").val();
+    var tagsToFilter = $("#tagSelectorInput").val();
+    var filterByDateRange = $("#dateRangeSelector").is(":checked");
+    var startDate = $("#dateRangeStartDate").val();
+    var endDate = $("#dateRangeEndDate").val();
     $("#columnSelector :checked").map(function () {
         if ($(this).hasClass('column-default')) {
             reportVisibleColumns.push(this.value);
@@ -11,26 +16,78 @@ function getAndValidateSelectedColumns() {
             reportExtraFields.push(this.value);
         }
     });
+    var hasValidationError = false;
+    var validationErrorMessage = "";
     if (reportVisibleColumns.length + reportExtraFields.length == 0) {
+        hasValidationError = true;
+        validationErrorMessage = "You must select at least one column";
+    }
+    if (filterByDateRange) {
+        //validate date range
+        let startDateTicks = $("#dateRangeStartDate").datepicker('getDate')?.getTime();
+        let endDateTicks = $("#dateRangeEndDate").datepicker('getDate')?.getTime();
+        if (!startDateTicks || !endDateTicks || startDateTicks > endDateTicks) {
+            hasValidationError = true;
+            validationErrorMessage = "Invalid date range";
+        }
+    }
+
+    if (hasValidationError) {
         return {
             hasError: true,
+            errorMessage: validationErrorMessage,
             visibleColumns: [],
-            extraFields: []
+            extraFields: [],
+            tagFilter: tagFilterMode,
+            tags: [],
+            filterByDateRange: filterByDateRange,
+            startDate: '',
+            endDate: ''
         }
     } else {
         return {
             hasError: false,
+            errorMessage: '',
             visibleColumns: reportVisibleColumns,
-            extraFields: reportExtraFields
+            extraFields: reportExtraFields,
+            tagFilter: tagFilterMode,
+            tags: tagsToFilter,
+            filterByDateRange: filterByDateRange,
+            startDate: startDate,
+            endDate: endDate
         }
     }
 }
+function getSavedReportParameters() {
+    var vehicleId = GetVehicleId().vehicleId;
+    var selectedReportColumns = sessionStorage.getItem(`${vehicleId}_selectedReportColumns`);
+    if (selectedReportColumns != null) {
+        selectedReportColumns = JSON.parse(selectedReportColumns);
+        //unselected everything
+        $(".column-extrafield").prop('checked', false);
+        $(".column-default").prop('checked', false);
+        //load selected checkboxes
+        selectedReportColumns.extraFields.map(x => {
+            $(`[value='${x}'].column-extrafield`).prop('checked', true);
+        });
+        selectedReportColumns.visibleColumns.map(x => {
+            $(`[value='${x}'].column-default`).prop('checked', true);
+        });
+        $("#tagSelector").val(selectedReportColumns.tagFilter);
+        selectedReportColumns.tags.map(x => {
+            $("#tagSelectorInput").append(`<option value='${x}'>${x}</option>`)
+        });
+        $("#dateRangeSelector").prop('checked', selectedReportColumns.filterByDateRange);
+        $("#dateRangeStartDate").val(selectedReportColumns.startDate);
+        $("#dateRangeEndDate").val(selectedReportColumns.endDate);
+    }
+}
 function generateVehicleHistoryReport() {
+    var vehicleId = GetVehicleId().vehicleId;
     $.get(`/Vehicle/GetReportParameters`, function (data) {
         if (data) {
-            //prompt user to select a vehicle
+            //prompt user to select columns
             Swal.fire({
-                title: 'Select Columns',
                 html: data,
                 confirmButtonText: 'Generate Report',
                 focusConfirm: false,
@@ -38,13 +95,21 @@ function generateVehicleHistoryReport() {
                     //validate
                     var selectedColumnsData = getAndValidateSelectedColumns();
                     if (selectedColumnsData.hasError) {
-                        Swal.showValidationMessage(`You must select at least one column`);
+                        Swal.showValidationMessage(selectedColumnsData.errorMessage);
                     }
                     return { selectedColumnsData }
                 },
+                didOpen: () => {
+                    getSavedReportParameters();
+                    initTagSelector($("#tagSelectorInput"));
+                    initDatePicker($('#dateRangeStartDate'));
+                    initDatePicker($('#dateRangeEndDate'));
+                }
             }).then(function (result) {
                 if (result.isConfirmed) {
-                    var vehicleId = GetVehicleId().vehicleId;
+                    //save params in sessionStorage
+                    sessionStorage.setItem(`${vehicleId}_selectedReportColumns`, JSON.stringify(result.value.selectedColumnsData));
+                    //post params
                     $.post(`/Vehicle/GetVehicleHistory?vehicleId=${vehicleId}`, {
                         reportParameter: result.value.selectedColumnsData
                     }, function (data) {
@@ -86,14 +151,16 @@ function setSelectedMetrics() {
     });
     var yearMetric = $('#yearOption').val();
     var reminderMetric = $("#reminderOption").val();
-    sessionStorage.setItem("selectedMetricCheckBoxes", JSON.stringify(selectedMetricCheckBoxes));
-    sessionStorage.setItem("yearMetric", yearMetric);
-    sessionStorage.setItem("reminderMetric", reminderMetric);
+    var vehicleId = GetVehicleId().vehicleId;
+    sessionStorage.setItem(`${vehicleId}_selectedMetricCheckBoxes`, JSON.stringify(selectedMetricCheckBoxes));
+    sessionStorage.setItem(`${vehicleId}_yearMetric`, yearMetric);
+    sessionStorage.setItem(`${vehicleId}_reminderMetric`, reminderMetric);
 }
 function getSelectedMetrics() {
-    var selectedMetricCheckBoxes = sessionStorage.getItem("selectedMetricCheckBoxes");
-    var yearMetric = sessionStorage.getItem("yearMetric");
-    var reminderMetric = sessionStorage.getItem("reminderMetric");
+    var vehicleId = GetVehicleId().vehicleId;
+    var selectedMetricCheckBoxes = sessionStorage.getItem(`${vehicleId}_selectedMetricCheckBoxes`);
+    var yearMetric = sessionStorage.getItem(`${vehicleId}_yearMetric`);
+    var reminderMetric = sessionStorage.getItem(`${vehicleId}_reminderMetric`);
     if (selectedMetricCheckBoxes != null && yearMetric != null && reminderMetric != null) {
         selectedMetricCheckBoxes = JSON.parse(selectedMetricCheckBoxes);
         $(".reportCheckBox").prop('checked', false);
@@ -151,6 +218,66 @@ function refreshBarChart() {
     });
     setSelectedMetrics();
 }
+function showBarChartTable(elemClicked) {
+    var selectedMetrics = [];
+    var vehicleId = GetVehicleId().vehicleId;
+    var year = getYear();
+
+    if ($("#serviceExpenseCheck").is(":checked")) {
+        selectedMetrics.push('ServiceRecord');
+    }
+    if ($("#repairExpenseCheck").is(":checked")) {
+        selectedMetrics.push('RepairRecord');
+    }
+    if ($("#upgradeExpenseCheck").is(":checked")) {
+        selectedMetrics.push('UpgradeRecord');
+    }
+    if ($("#gasExpenseCheck").is(":checked")) {
+        selectedMetrics.push('GasRecord');
+    }
+    if ($("#taxExpenseCheck").is(":checked")) {
+        selectedMetrics.push('TaxRecord');
+    }
+    if ($("#odometerExpenseCheck").is(":checked")) {
+        selectedMetrics.push('OdometerRecord');
+    }
+
+    $.post('/Vehicle/GetCostByMonthAndYearByVehicle',
+        {
+            vehicleId: vehicleId,
+            selectedMetrics: selectedMetrics,
+            year: year
+        }, function (data) {
+            $("#vehicleDataTableModalContent").html(data);
+            $("#vehicleDataTableModal").modal('show');
+            //highlight clicked row.
+            if (elemClicked.length > 0) {
+                var rowClickedIndex = elemClicked[0].index + 1;
+                var rowToHighlight = $("#vehicleDataTableModalContent").find(`tbody > tr:nth-child(${rowClickedIndex})`);
+                if (rowToHighlight.length > 0) {
+                    rowToHighlight.addClass('table-info');
+                }
+            }
+        });
+}
+function toggleBarChartTableData() {
+    //find out which column data type is shown
+    if (!$('[report-data="cost"]').hasClass('d-none')) {
+        //currently cost is shown.
+        $('[report-data="cost"]').addClass('d-none');
+        $('[report-data="distance"]').removeClass('d-none');
+    }
+    else if (!$('[report-data="distance"]').hasClass('d-none')) {
+        //currently distance is shown.
+        $('[report-data="distance"]').addClass('d-none');
+        $('[report-data="costperdistance"]').removeClass('d-none');
+    }
+    else if (!$('[report-data="costperdistance"]').hasClass('d-none')) {
+        //currently cost per distance is shown.
+        $('[report-data="costperdistance"]').addClass('d-none');
+        $('[report-data="cost"]').removeClass('d-none');
+    }
+}
 function updateReminderPie() {
     var vehicleId = GetVehicleId().vehicleId;
     var daysToAdd = $("#reminderOption").val();
@@ -234,12 +361,19 @@ function exportAttachments() {
         }
     });
 }
-function showDataTable() {
+function showDataTable(elemClicked) {
     var vehicleId = GetVehicleId().vehicleId;
     var year = getYear();
     $.get(`/Vehicle/GetCostTableForVehicle?vehicleId=${vehicleId}`, { year: year }, function (data) {
         $("#vehicleDataTableModalContent").html(data);
         $("#vehicleDataTableModal").modal('show');
+        if (elemClicked.length > 0) {
+            var rowClickedIndex = elemClicked[0].index + 1;
+            var rowToHighlight = $("#vehicleDataTableModalContent").find(`tbody > tr:nth-child(${rowClickedIndex})`);
+            if (rowToHighlight.length > 0) {
+                rowToHighlight.addClass('table-info');
+            }
+        }
     });
 }
 function hideDataTable() {
@@ -323,4 +457,12 @@ function loadCustomWidgets() {
 }
 function hideCustomWidgetsModal() {
     $("#vehicleCustomWidgetsModal").modal('hide');
+}
+
+function showReportAdvancedParameters() {
+    if ($(".report-advanced-parameters").hasClass("d-none")) {
+        $(".report-advanced-parameters").removeClass("d-none");
+    } else {
+        $(".report-advanced-parameters").addClass("d-none");
+    }
 }

wwwroot/js/servicerecord.js

@@ -149,6 +149,7 @@ function getAndValidateServiceRecordValues() {
         addReminderRecord: addReminderRecord,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
+        deletedRequisitionHistory: deletedSupplyUsageHistory,
         reminderRecordId: recurringReminderRecordId,
         copySuppliesAttachment: copySuppliesAttachments
     }

wwwroot/js/settings.js

@@ -57,6 +57,7 @@ function updateSettings() {
         automaticDecimalFormat: $("#automaticDecimalFormat").is(":checked"),
         useUKMpg: $("#useUKMPG").is(":checked"),
         useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
+        useThreeDecimalGasConsumption: $("#useThreeDecimalGasConsumption").is(":checked"),
         useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
         enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
         enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
@@ -66,6 +67,7 @@ function updateSettings() {
         preferredGasUnit: $("#preferredGasUnit").val(),
         preferredGasMileageUnit: $("#preferredFuelMileageUnit").val(),
         userLanguage: $("#defaultLanguage").val(),
+        useUnitForFuelCost: $("#useUnitForFuelCost").is(":checked"),
         visibleTabs: visibleTabs,
         defaultTab: defaultTab,
         tabOrder: tabOrder,

wwwroot/js/shared.js

@@ -28,6 +28,21 @@ function errorToast(message) {
         }
     })
 }
+function infoToast(message) {
+    Swal.fire({
+        toast: true,
+        position: "top-end",
+        showConfirmButton: false,
+        timer: 3000,
+        title: message,
+        timerProgressBar: true,
+        icon: "info",
+        didOpen: (toast) => {
+            toast.onmouseenter = Swal.stopTimer;
+            toast.onmouseleave = Swal.resumeTimer;
+        }
+    })
+}
 function viewVehicle(vehicleId) {
     window.location.href = `/Vehicle/Index?vehicleId=${vehicleId}`;
 }
@@ -479,7 +494,7 @@ function updateAggregateLabels() {
     var sumLabel = $("[data-aggregate-type='sum']");
     if (sumLabel.length > 0) {
         var labelsToSum = $("[data-record-type='cost']").parent(":not('.override-hide')").children("[data-record-type='cost']").toArray();
-        var newSum = 0;
+        var newSum = "0.00";
         if (labelsToSum.length > 0) {
             newSum = labelsToSum.map(x => globalParseFloat(x.textContent)).reduce((a, b,) => a + b).toFixed(2);
         }
@@ -825,6 +840,10 @@ function duplicateRecords(ids, source) {
             friendlySource = "Fuel Records";
             refreshDataCallBack = getVehicleGasRecords;
             break;
+        case "PlanRecord":
+            friendlySource = "Plan";
+            refreshDataCallBack = getVehiclePlanRecords;
+            break;
     }
 
     Swal.fire({
@@ -894,6 +913,10 @@ function duplicateRecordsToOtherVehicles(ids, source) {
             friendlySource = "Fuel Records";
             refreshDataCallBack = getVehicleGasRecords;
             break;
+        case "PlanRecord":
+            friendlySource = "Plan";
+            refreshDataCallBack = getVehiclePlanRecords;
+            break;
     }
 
     $.get(`/Home/GetVehicleSelector?vehicleId=${GetVehicleId().vehicleId}`, function (data) {
@@ -928,6 +951,55 @@ function duplicateRecordsToOtherVehicles(ids, source) {
         }
     })
 }
+function insertOdometer(ids, source) {
+    if (ids.length == 0) {
+        return;
+    }
+    $("#workAroundInput").show();
+    var friendlySource = "";
+    var refreshDataCallBack;
+    var recordVerbiage = ids.length > 1 ? `these ${ids.length} records` : "this record";
+    switch (source) {
+        case "ServiceRecord":
+            friendlySource = "Service Records";
+            refreshDataCallBack = getVehicleServiceRecords;
+            break;
+        case "RepairRecord":
+            friendlySource = "Repairs";
+            refreshDataCallBack = getVehicleCollisionRecords;
+            break;
+        case "UpgradeRecord":
+            friendlySource = "Upgrades";
+            refreshDataCallBack = getVehicleUpgradeRecords;
+            break;
+        case "GasRecord":
+            friendlySource = "Fuel Records";
+            refreshDataCallBack = getVehicleGasRecords;
+            break;
+    }
+
+    Swal.fire({
+        title: "Create Odometer Records?",
+        text: `Create Odometer Records based on ${recordVerbiage}?`,
+        showCancelButton: true,
+        confirmButtonText: "Create",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post('/Vehicle/BulkCreateOdometerRecords', { recordIds: ids, importMode: source }, function (data) {
+                if (data) {
+                    successToast(`${ids.length} Odometer Record(s) Created`);
+                    var vehicleId = GetVehicleId().vehicleId;
+                    refreshDataCallBack(vehicleId);
+                } else {
+                    errorToast(genericErrorMessage());
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
 var selectedRow = [];
 var isDragging = false;
 $(window).on('mouseup', function (e) {
@@ -960,8 +1032,9 @@ function rangeMouseDown(e) {
     if (isRightClick(e)) {
         return;
     }
-    var contextMenuAction = $(e.target).is(".table-context-menu > li > .dropdown-item")
-    if (!(e.ctrlKey || e.metaKey) && !contextMenuAction) {
+    var contextMenuAction = $(e.target).parents(".table-context-menu > li > .dropdown-item").length > 0 || $(e.target).is(".table-context-menu > li > .dropdown-item");
+    var selectMode = $("#chkSelectMode").length > 0 ? $("#chkSelectMode").is(":checked") : false;
+    if (!(e.ctrlKey || e.metaKey || selectMode) && !contextMenuAction) {
         clearSelectedRows();
     }
     isDragging = true;
@@ -983,12 +1056,12 @@ function stopEvent() {
     event.stopPropagation();
 }
 function rangeMouseUp(e) {
-    if ($(".table-context-menu").length > 0) {
-        $(".table-context-menu").hide();
-    }
     if (isRightClick(e)) {
         return;
     }
+    if ($(".table-context-menu").length > 0) {
+        $(".table-context-menu").fadeOut("fast");
+    }
     isDragging = false;
     document.documentElement.onselectstart = function () { return true; };
 }
@@ -1029,10 +1102,9 @@ function showTableContextMenu(e) {
     if (getDeviceIsTouchOnly()) {
         return;
     }
-    $(".table-context-menu").show();
+    $(".table-context-menu").fadeIn("fast");
     determineContextMenuItems();
     $(".table-context-menu").css({
-        position: "absolute",
         left: getMenuPosition(event.clientX, 'width', 'scrollLeft'),
         top: getMenuPosition(event.clientY, 'height', 'scrollTop')
     });
@@ -1090,7 +1162,8 @@ function getMenuPosition(mouse, direction, scrollDir) {
     return position;
 }
 function handleTableRowClick(e, callBack, rowId) {
-    if (!(event.ctrlKey || event.metaKey)) {
+    var selectMode = $("#chkSelectMode").length > 0 ? $("#chkSelectMode").is(":checked") : false;
+    if (!(event.ctrlKey || event.metaKey || selectMode)) {
         callBack(rowId);
     } else if (!$(e).hasClass('table-active')) {
         addToSelectedRows($(e).attr('data-rowId'));
@@ -1107,13 +1180,12 @@ function showTableContextMenuForMobile(e, xPosition, yPosition) {
         $(e).addClass('table-active');
         shakeTableRow(e);
     } else {
-        $(".table-context-menu").show();
-        determineContextMenuItems();
+        $(".table-context-menu").fadeIn("fast");
         $(".table-context-menu").css({
-            position: "absolute",
             left: getMenuPosition(xPosition, 'width', 'scrollLeft'),
             top: getMenuPosition(yPosition, 'height', 'scrollTop')
         });
+        determineContextMenuItems();
     }
 }
 function shakeTableRow(e) {

wwwroot/js/taxrecord.js

@@ -178,4 +178,14 @@ function getAndValidateTaxRecordValues() {
         extraFields: extraFields.extraFields,
         reminderRecordId: recurringReminderRecordId
     }
+}
+
+function checkRecurringTaxes() {
+    let vehicleId = GetVehicleId().vehicleId
+    $.post('/Vehicle/CheckRecurringTaxRecords', { vehicleId: vehicleId }, function (data) {
+        if (data) {
+            //notify users that recurring tax records were updated and they should refresh the page to see the new changes.
+            infoToast(`Recurring Tax Records Updated!<br /><br /><a class='text-link' style='cursor:pointer;' onclick='viewVehicle(${vehicleId})'>Refresh to see new records</a>`);
+        }
+    })
 }

wwwroot/js/upgraderecord.js

@@ -149,6 +149,7 @@ function getAndValidateUpgradeRecordValues() {
         addReminderRecord: addReminderRecord,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
+        deletedRequisitionHistory: deletedSupplyUsageHistory,
         reminderRecordId: recurringReminderRecordId,
         copySuppliesAttachment: copySuppliesAttachments
     }

wwwroot/js/vehicle.js

@@ -368,6 +368,9 @@ function showRecurringReminderSelector(descriptionFieldName) {
     })
 }
 function editMultipleRecords(ids, dataType) {
+    if (ids.length < 2) {
+        return;
+    }
     $.post('/Vehicle/GetGenericRecordModal', { recordIds: ids, dataType: dataType }, function (data) {
         if (data) {
             $("#genericRecordEditModalContent").html(data);
@@ -549,6 +552,7 @@ function adjustRecordsOdometer(ids, source) {
         confirmButtonColor: "#dc3545"
     }).then((result) => {
         if (result.isConfirmed) {
+            saveScrollPosition();
             $.post('/Vehicle/AdjustRecordsOdometer', { recordIds: ids, vehicleId: GetVehicleId().vehicleId, importMode: source }, function (data) {
                 if (data) {
                     successToast(`${ids.length} Record(s) Updated`);