Merge pull request #188 from hargata/Hargata/parse.url

added setting to automatically load parsed markdown.

.env

@@ -5,4 +5,5 @@ MailConfig__EmailFrom=""
 MailConfig__UseSSL="false"
 MailConfig__Port=587
 MailConfig__Username=""
-MailConfig__Password=""
+MailConfig__Password=""
+LOGGING__LOGLEVEL__DEFAULT=Error

Controllers/APIController.cs

@@ -22,10 +22,13 @@ namespace CarCareTracker.Controllers
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
         private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
+        private readonly IUserAccessDataAccess _userAccessDataAccess;
+        private readonly IUserRecordDataAccess _userRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
         private readonly IGasHelper _gasHelper;
         private readonly IUserLogic _userLogic;
         private readonly IFileHelper _fileHelper;
+        private readonly IMailHelper _mailHelper;
         public APIController(IVehicleDataAccess dataAccess,
             IGasHelper gasHelper,
             IReminderHelper reminderHelper,
@@ -37,6 +40,9 @@ namespace CarCareTracker.Controllers
             IReminderRecordDataAccess reminderRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
+            IUserAccessDataAccess userAccessDataAccess,
+            IUserRecordDataAccess userRecordDataAccess,
+            IMailHelper mailHelper,
             IFileHelper fileHelper,
             IUserLogic userLogic) 
         {
@@ -49,6 +55,9 @@ namespace CarCareTracker.Controllers
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
+            _userAccessDataAccess = userAccessDataAccess;
+            _userRecordDataAccess = userRecordDataAccess;
+            _mailHelper = mailHelper;
             _gasHelper = gasHelper;
             _reminderHelper = reminderHelper;
             _userLogic = userLogic;
@@ -83,6 +92,53 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        [Route("/api/vehicle/servicerecords/add")]
+        public IActionResult AddServiceRecord(int vehicleId, ServiceRecordExportModel input)
+        {
+            var response = new OperationResponse();
+            if (vehicleId == default)
+            {
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            if (string.IsNullOrWhiteSpace(input.Date) ||
+                string.IsNullOrWhiteSpace(input.Description) ||
+                string.IsNullOrWhiteSpace(input.Odometer) ||
+                string.IsNullOrWhiteSpace(input.Cost))
+            {
+                response.Success = false;
+                response.Message = "Input object invalid, Date, Description, Odometer, and Cost cannot be empty.";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            try
+            {
+                var serviceRecord = new ServiceRecord()
+                {
+                    VehicleId = vehicleId,
+                    Date = DateTime.Parse(input.Date),
+                    Mileage = int.Parse(input.Odometer),
+                    Description = input.Description,
+                    Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    Cost = decimal.Parse(input.Cost)
+                };
+                _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord);
+                response.Success = true;
+                response.Message = "Service Record Added";
+                return Json(response);
+            }
+            catch (Exception ex)
+            {
+                response.Success = false;
+                response.Message = ex.Message;
+                Response.StatusCode = 500;
+                return Json(response);
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/repairrecords")]
         public IActionResult RepairRecords(int vehicleId)
@@ -92,6 +148,53 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        [Route("/api/vehicle/repairrecords/add")]
+        public IActionResult AddRepairRecord(int vehicleId, ServiceRecordExportModel input)
+        {
+            var response = new OperationResponse();
+            if (vehicleId == default)
+            {
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            if (string.IsNullOrWhiteSpace(input.Date) ||
+                string.IsNullOrWhiteSpace(input.Description) ||
+                string.IsNullOrWhiteSpace(input.Odometer) ||
+                string.IsNullOrWhiteSpace(input.Cost))
+            {
+                response.Success = false;
+                response.Message = "Input object invalid, Date, Description, Odometer, and Cost cannot be empty.";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            try
+            {
+                var repairRecord = new CollisionRecord()
+                {
+                    VehicleId = vehicleId,
+                    Date = DateTime.Parse(input.Date),
+                    Mileage = int.Parse(input.Odometer),
+                    Description = input.Description,
+                    Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    Cost = decimal.Parse(input.Cost)
+                };
+                _collisionRecordDataAccess.SaveCollisionRecordToVehicle(repairRecord);
+                response.Success = true;
+                response.Message = "Repair Record Added";
+                return Json(response);
+            }
+            catch (Exception ex)
+            {
+                response.Success = false;
+                response.Message = ex.Message;
+                Response.StatusCode = 500;
+                return Json(response);
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/upgraderecords")]
         public IActionResult UpgradeRecords(int vehicleId)
@@ -101,6 +204,53 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        [Route("/api/vehicle/upgraderecords/add")]
+        public IActionResult AddUpgradeRecord(int vehicleId, ServiceRecordExportModel input)
+        {
+            var response = new OperationResponse();
+            if (vehicleId == default)
+            {
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            if (string.IsNullOrWhiteSpace(input.Date) ||
+                string.IsNullOrWhiteSpace(input.Description) ||
+                string.IsNullOrWhiteSpace(input.Odometer) ||
+                string.IsNullOrWhiteSpace(input.Cost))
+            {
+                response.Success = false;
+                response.Message = "Input object invalid, Date, Description, Odometer, and Cost cannot be empty.";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            try
+            {
+                var upgradeRecord = new UpgradeRecord()
+                {
+                    VehicleId = vehicleId,
+                    Date = DateTime.Parse(input.Date),
+                    Mileage = int.Parse(input.Odometer),
+                    Description = input.Description,
+                    Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    Cost = decimal.Parse(input.Cost)
+                };
+                _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord);
+                response.Success = true;
+                response.Message = "Upgrade Record Added";
+                return Json(response);
+            }
+            catch (Exception ex)
+            {
+                response.Success = false;
+                response.Message = ex.Message;
+                Response.StatusCode = 500;
+                return Json(response);
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/taxrecords")]
         public IActionResult TaxRecords(int vehicleId)
@@ -109,6 +259,51 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        [Route("/api/vehicle/taxrecords/add")]
+        public IActionResult AddTaxRecord(int vehicleId, TaxRecordExportModel input)
+        {
+            var response = new OperationResponse();
+            if (vehicleId == default)
+            {
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            if (string.IsNullOrWhiteSpace(input.Date) ||
+                string.IsNullOrWhiteSpace(input.Description) ||
+                string.IsNullOrWhiteSpace(input.Cost))
+            {
+                response.Success = false;
+                response.Message = "Input object invalid, Date, Description, and Cost cannot be empty.";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            try
+            {
+                var taxRecord = new TaxRecord()
+                {
+                    VehicleId = vehicleId,
+                    Date = DateTime.Parse(input.Date),
+                    Description = input.Description,
+                    Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    Cost = decimal.Parse(input.Cost)
+                };
+                _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord);
+                response.Success = true;
+                response.Message = "Tax Record Added";
+                return Json(response);
+            }
+            catch (Exception ex)
+            {
+                response.Success = false;
+                response.Message = ex.Message;
+                Response.StatusCode = 500;
+                return Json(response);
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/odometerrecords")]
         public IActionResult OdometerRecords(int vehicleId)
@@ -127,6 +322,15 @@ namespace CarCareTracker.Controllers
             {
                 response.Success = false;
                 response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            if (string.IsNullOrWhiteSpace(input.Date) ||
+                string.IsNullOrWhiteSpace(input.Odometer))
+            {
+                response.Success = false;
+                response.Message = "Input object invalid, Date and Odometer cannot be empty.";
+                Response.StatusCode = 400;
                 return Json(response);
             }
             try
@@ -145,7 +349,8 @@ namespace CarCareTracker.Controllers
             } catch (Exception ex)
             {
                 response.Success = false;
-                response.Message = StaticHelper.GenericErrorMessage;
+                response.Message = ex.Message;
+                Response.StatusCode = 500;
                 return Json(response);
             }
         }
@@ -169,6 +374,58 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        [Route("/api/vehicle/gasrecords/add")]
+        public IActionResult AddGasRecord(int vehicleId, GasRecordExportModel input)
+        {
+            var response = new OperationResponse();
+            if (vehicleId == default)
+            {
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            if (string.IsNullOrWhiteSpace(input.Date) ||
+                string.IsNullOrWhiteSpace(input.Odometer) ||
+                string.IsNullOrWhiteSpace(input.FuelConsumed) ||
+                string.IsNullOrWhiteSpace(input.Cost) ||
+                string.IsNullOrWhiteSpace(input.IsFillToFull) ||
+                string.IsNullOrWhiteSpace(input.MissedFuelUp)
+                )
+            {
+                response.Success = false;
+                response.Message = "Input object invalid, Date, Odometer, FuelConsumed, IsFillToFull, MissedFuelUp, and Cost cannot be empty.";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            try
+            {
+                var gasRecord = new GasRecord()
+                {
+                    VehicleId = vehicleId,
+                    Date = DateTime.Parse(input.Date),
+                    Mileage = int.Parse(input.Odometer),
+                    Gallons = decimal.Parse(input.FuelConsumed),
+                    IsFillToFull = bool.Parse(input.IsFillToFull),
+                    MissedFuelUp = bool.Parse(input.MissedFuelUp),
+                    Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    Cost = decimal.Parse(input.Cost)
+                };
+                _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord);
+                response.Success = true;
+                response.Message = "Gas Record Added";
+                return Json(response);
+            }
+            catch (Exception ex)
+            {
+                response.Success = false;
+                response.Message = ex.Message;
+                Response.StatusCode = 500;
+                return Json(response);
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/reminders")]
         public IActionResult Reminders(int vehicleId)
@@ -180,12 +437,65 @@ namespace CarCareTracker.Controllers
         }
         [Authorize(Roles = nameof(UserData.IsRootUser))]
         [HttpGet]
+        [Route("/api/vehicle/reminders/send")]
+        public IActionResult SendReminders(List<ReminderUrgency> urgencies)
+        {
+            var vehicles = _dataAccess.GetVehicles();
+            List<OperationResponse> operationResponses = new List<OperationResponse>();
+            foreach(Vehicle vehicle in vehicles)
+            {
+                var vehicleId = vehicle.Id;
+                //get reminders
+                var currentMileage = GetMaxMileage(vehicleId);
+                var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
+                var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).OrderByDescending(x => x.Urgency).ToList();
+                results.RemoveAll(x => !urgencies.Contains(x.Urgency));
+                if (!results.Any())
+                {
+                    continue;
+                }
+                //get list of recipients.
+                var userIds = _userAccessDataAccess.GetUserAccessByVehicleId(vehicleId).Select(x => x.Id.UserId);
+                List<string> emailRecipients = new List<string>();
+                foreach (int userId in userIds)
+                {
+                    var userData = _userRecordDataAccess.GetUserRecordById(userId);
+                    emailRecipients.Add(userData.EmailAddress);
+                };
+                if (!emailRecipients.Any())
+                {
+                    continue;
+                }
+                var result = _mailHelper.NotifyUserForReminders(vehicle, emailRecipients, results);
+                operationResponses.Add(result);
+            }
+            if (operationResponses.All(x => x.Success))
+            {
+                return Json(new OperationResponse { Success = true, Message = "Emails sent" });
+            } else if (operationResponses.All(x => !x.Success))
+            {
+                return Json(new OperationResponse { Success = false, Message = "All emails failed, check SMTP settings" });
+            } else
+            {
+                return Json(new OperationResponse { Success = true, Message = "Some emails sent, some failed, check recipient settings" });
+            }
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
         [Route("/api/makebackup")]
         public IActionResult MakeBackup()
         {
             var result = _fileHelper.MakeBackup();
             return Json(result);
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
+        [Route("/api/demo/restore")]
+        public IActionResult RestoreDemo()
+        {
+            var result = _fileHelper.RestoreBackup("/defaults/demo_default.zip", true);
+            return Json(result);
+        }
         private int GetMaxMileage(int vehicleId)
         {
             var numbersArray = new List<int>();

Controllers/ErrorController.cs

@@ -6,6 +6,11 @@ namespace CarCareTracker.Controllers
     {
         public IActionResult Unauthorized()
         {
+            if (!User.IsInRole("CookieAuth"))
+            {
+                Response.StatusCode = 403;
+                return new EmptyResult();
+            }
             return View("401");
         }
     }

Controllers/VehicleController.cs

@@ -85,6 +85,7 @@ namespace CarCareTracker.Controllers
         public IActionResult Index(int vehicleId)
         {
             var data = _dataAccess.GetVehicleById(vehicleId);
+            UpdateRecurringTaxes(vehicleId);
             return View(data);
         }
         [HttpGet]
@@ -316,7 +317,6 @@ namespace CarCareTracker.Controllers
                 var vehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
                 bool useMPG = _config.GetUserConfig(User).UseMPG;
                 bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
-                vehicleRecords = vehicleRecords.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
                 var convertedRecords = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG);
                 var exportData = convertedRecords.Select(x => new GasRecordExportModel
                 {
@@ -376,7 +376,7 @@ namespace CarCareTracker.Controllers
                                     {
                                         VehicleId = vehicleId,
                                         Date = DateTime.Parse(importModel.Date),
-                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes
                                     };
@@ -420,7 +420,7 @@ namespace CarCareTracker.Controllers
                                     {
                                         VehicleId = vehicleId,
                                         Date = DateTime.Parse(importModel.Date),
-                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any)
@@ -433,7 +433,7 @@ namespace CarCareTracker.Controllers
                                     {
                                         VehicleId = vehicleId,
                                         Date = DateTime.Parse(importModel.Date),
-                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes
                                     };
                                     _odometerRecordDataAccess.SaveOdometerRecordToVehicle(convertedRecord);
@@ -463,7 +463,7 @@ namespace CarCareTracker.Controllers
                                     {
                                         VehicleId = vehicleId,
                                         Date = DateTime.Parse(importModel.Date),
-                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any)
@@ -476,7 +476,7 @@ namespace CarCareTracker.Controllers
                                     {
                                         VehicleId = vehicleId,
                                         Date = DateTime.Parse(importModel.Date),
-                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any)
@@ -529,8 +529,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetGasRecordsByVehicleId(int vehicleId)
         {
             var result = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
-            //need it in ascending order to perform computation.
-            result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
             //check if the user uses MPG or Liters per 100km.
             var userConfig = _config.GetUserConfig(User);
             bool useMPG = userConfig.UseMPG;
@@ -540,10 +538,13 @@ namespace CarCareTracker.Controllers
             {
                 computedResults = computedResults.OrderByDescending(x => DateTime.Parse(x.Date)).ThenByDescending(x => x.Mileage).ToList();
             }
-            var vehicleIsElectric = _dataAccess.GetVehicleById(vehicleId).IsElectric;
+            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
+            var vehicleIsElectric = vehicleData.IsElectric;
+            var vehicleUseHours = vehicleData.UseHours;
             var viewModel = new GasRecordViewModelContainer()
             {
                 UseKwh = vehicleIsElectric,
+                UseHours = vehicleUseHours,
                 GasRecords = computedResults
             };
             return PartialView("_Gas", viewModel);
@@ -551,14 +552,27 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveGasRecordToVehicleId(GasRecordInput gasRecord)
         {
+            if (gasRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
+            {
+                _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord
+                {
+                    Date = DateTime.Parse(gasRecord.Date),
+                    VehicleId = gasRecord.VehicleId,
+                    Mileage = gasRecord.Mileage,
+                    Notes = $"Auto Insert From Gas Record. {gasRecord.Notes}"
+                });
+            }
             gasRecord.Files = gasRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord.ToGasRecord());
             return Json(result);
         }
         [HttpGet]
-        public IActionResult GetAddGasRecordPartialView()
+        public IActionResult GetAddGasRecordPartialView(int vehicleId)
         {
-            return PartialView("_GasModal", new GasRecordInputContainer() { GasRecord = new GasRecordInput() });
+            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
+            var vehicleIsElectric = vehicleData.IsElectric;
+            var vehicleUseHours = vehicleData.UseHours;
+            return PartialView("_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() });
         }
         [HttpGet]
         public IActionResult GetGasRecordForEditById(int gasRecordId)
@@ -577,10 +591,13 @@ namespace CarCareTracker.Controllers
                 MissedFuelUp = result.MissedFuelUp,
                 Notes = result.Notes
             };
-            var vehicleIsElectric = _dataAccess.GetVehicleById(convertedResult.VehicleId).IsElectric;
+            var vehicleData = _dataAccess.GetVehicleById(convertedResult.VehicleId);
+            var vehicleIsElectric = vehicleData.IsElectric;
+            var vehicleUseHours = vehicleData.UseHours;
             var viewModel = new GasRecordInputContainer()
             {
                 UseKwh = vehicleIsElectric,
+                UseHours = vehicleUseHours,
                 GasRecord = convertedResult
             };
             return PartialView("_GasModal", viewModel);
@@ -612,9 +629,23 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveServiceRecordToVehicleId(ServiceRecordInput serviceRecord)
         {
+            if (serviceRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
+            {
+                _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord
+                {
+                    Date = DateTime.Parse(serviceRecord.Date),
+                    VehicleId = serviceRecord.VehicleId,
+                    Mileage = serviceRecord.Mileage,
+                    Notes = $"Auto Insert From Service Record: {serviceRecord.Description}"
+                });
+            }
             //move files from temp.
             serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord());
+            if (result && serviceRecord.Supplies.Any())
+            {
+                RequisitionSupplyRecordsByUsage(serviceRecord.Supplies);
+            }
             return Json(result);
         }
         [HttpGet]
@@ -667,9 +698,23 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveCollisionRecordToVehicleId(CollisionRecordInput collisionRecord)
         {
+            if (collisionRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
+            {
+                _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord
+                {
+                    Date = DateTime.Parse(collisionRecord.Date),
+                    VehicleId = collisionRecord.VehicleId,
+                    Mileage = collisionRecord.Mileage,
+                    Notes = $"Auto Insert From Repair Record: {collisionRecord.Description}"
+                });
+            }
             //move files from temp.
             collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord());
+            if (result && collisionRecord.Supplies.Any())
+            {
+                RequisitionSupplyRecordsByUsage(collisionRecord.Supplies);
+            }
             return Json(result);
         }
         [HttpGet]
@@ -719,6 +764,34 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_TaxRecords", result);
         }
+        private void UpdateRecurringTaxes(int vehicleId)
+        {
+            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            var recurringFees = result.Where(x => x.IsRecurring);
+            if (recurringFees.Any())
+            {
+                foreach(TaxRecord recurringFee in recurringFees)
+                {
+                    var newDate = recurringFee.Date.AddMonths((int)recurringFee.RecurringInterval);
+                    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,
+                            Files = recurringFee.Files
+                        };
+                        _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
+                        _taxRecordDataAccess.SaveTaxRecordToVehicle(newRecurringFee);
+                    }
+                }
+            }
+        }
         [HttpPost]
         public IActionResult SaveTaxRecordToVehicleId(TaxRecordInput taxRecord)
         {
@@ -745,6 +818,8 @@ namespace CarCareTracker.Controllers
                 Description = result.Description,
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
+                IsRecurring = result.IsRecurring,
+                RecurringInterval = result.RecurringInterval,
                 Files = result.Files
             };
             return PartialView("_TaxRecordModal", convertedResult);
@@ -778,7 +853,7 @@ namespace CarCareTracker.Controllers
                 UpgradeRecordSum = upgradeRecords.Sum(x => x.Cost)
             };
             //get costbymonth
-            List<CostForVehicleByMonth> allCosts = new List<CostForVehicleByMonth>();
+            List<CostForVehicleByMonth> allCosts = StaticHelper.GetBaseLineCosts();
             allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, 0));
             allCosts.AddRange(_reportHelper.GetRepairRecordSum(collisionRecords, 0));
             allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
@@ -829,10 +904,17 @@ namespace CarCareTracker.Controllers
             var userConfig = _config.GetUserConfig(User);
             var mileageData = _gasHelper.GetGasRecordViewModels(gasRecords, userConfig.UseMPG, userConfig.UseUKMPG);
             mileageData.RemoveAll(x => x.MilesPerGallon == default);
-            var monthlyMileageData = mileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            var monthlyMileageData = StaticHelper.GetBaseLineCostsNoMonthName();
+            monthlyMileageData.AddRange(mileageData.GroupBy(x => x.MonthId).Select(x => new CostForVehicleByMonth
             {
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                MonthId = x.Key,
                 Cost = x.Average(y => y.MilesPerGallon)
+            }));
+            monthlyMileageData = monthlyMileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y=>y.Cost)
             }).ToList();
             viewModel.FuelMileageForVehicleByMonth = monthlyMileageData;
             return PartialView("_Report", viewModel);
@@ -899,6 +981,84 @@ namespace CarCareTracker.Controllers
             return PartialView("_ReminderMakeUpReport", viewModel);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult GetVehicleAttachments(int vehicleId, List<ImportMode> exportTabs)
+        {
+            List<GenericReportModel> attachmentData = new List<GenericReportModel>();
+            if (exportTabs.Contains(ImportMode.ServiceRecord)){
+                var records = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId).Where(x=>x.Files.Any());
+                attachmentData.AddRange(records.Select(x => new GenericReportModel
+                {
+                    Date = x.Date,
+                    Odometer = x.Mileage,
+                    Files = x.Files
+                }));
+            }
+            if (exportTabs.Contains(ImportMode.RepairRecord))
+            {
+                var records = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
+                attachmentData.AddRange(records.Select(x => new GenericReportModel
+                {
+                    Date = x.Date,
+                    Odometer = x.Mileage,
+                    Files = x.Files
+                }));
+            }
+            if (exportTabs.Contains(ImportMode.UpgradeRecord))
+            {
+                var records = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
+                attachmentData.AddRange(records.Select(x => new GenericReportModel
+                {
+                    Date = x.Date,
+                    Odometer = x.Mileage,
+                    Files = x.Files
+                }));
+            }
+            if (exportTabs.Contains(ImportMode.GasRecord))
+            {
+                var records = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
+                attachmentData.AddRange(records.Select(x => new GenericReportModel
+                {
+                    Date = x.Date,
+                    Odometer = x.Mileage,
+                    Files = x.Files
+                }));
+            }
+            if (exportTabs.Contains(ImportMode.TaxRecord))
+            {
+                var records = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
+                attachmentData.AddRange(records.Select(x => new GenericReportModel
+                {
+                    Date = x.Date,
+                    Odometer = 0,
+                    Files = x.Files
+                }));
+            }
+            if (exportTabs.Contains(ImportMode.OdometerRecord))
+            {
+                var records = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
+                attachmentData.AddRange(records.Select(x => new GenericReportModel
+                {
+                    Date = x.Date,
+                    Odometer = x.Mileage,
+                    Files = x.Files
+                }));
+            }
+            if (attachmentData.Any())
+            {
+                attachmentData = attachmentData.OrderBy(x => x.Date).ThenBy(x => x.Odometer).ToList();
+                var result = _fileHelper.MakeAttachmentsExport(attachmentData);
+                if (string.IsNullOrWhiteSpace(result))
+                {
+                    return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                }
+                return Json(new OperationResponse { Success = true, Message = result });
+            } else
+            {
+                return Json(new OperationResponse { Success = false, Message = "No Attachments Found" });
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         public IActionResult GetVehicleHistory(int vehicleId)
         {
             var vehicleHistory = new VehicleHistoryViewModel();
@@ -914,11 +1074,11 @@ namespace CarCareTracker.Controllers
             bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
             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);
-            var averageMPG = 0.00M;
+            var averageMPG = "0";
             var gasViewModels = _gasHelper.GetGasRecordViewModels(gasRecords, useMPG, useUKMPG);
             if (gasViewModels.Any())
             {
-                averageMPG = gasViewModels.Average(x => x.MilesPerGallon);
+                averageMPG = _gasHelper.GetAverageGasMileage(gasViewModels, useMPG);
             }
             vehicleHistory.MPG = averageMPG;
             //insert servicerecords
@@ -974,10 +1134,17 @@ namespace CarCareTracker.Controllers
                 mileageData.RemoveAll(x => DateTime.Parse(x.Date).Year != year);
             }
             mileageData.RemoveAll(x => x.MilesPerGallon == default);
-            var monthlyMileageData = mileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            var monthlyMileageData = StaticHelper.GetBaseLineCostsNoMonthName();
+            monthlyMileageData.AddRange(mileageData.GroupBy(x => x.MonthId).Select(x => new CostForVehicleByMonth
             {
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                MonthId = x.Key,
                 Cost = x.Average(y => y.MilesPerGallon)
+            }));
+            monthlyMileageData = monthlyMileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
             }).ToList();
             return PartialView("_MPGByMonthReport", monthlyMileageData);
         }
@@ -985,7 +1152,7 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult GetCostByMonthByVehicle(int vehicleId, List<ImportMode> selectedMetrics, int year = 0)
         {
-            List<CostForVehicleByMonth> allCosts = new List<CostForVehicleByMonth>();
+            List<CostForVehicleByMonth> allCosts = StaticHelper.GetBaseLineCosts();
             if (selectedMetrics.Contains(ImportMode.ServiceRecord))
             {
                 var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
@@ -1063,32 +1230,24 @@ namespace CarCareTracker.Controllers
         public IActionResult GetVehicleHaveUrgentOrPastDueReminders(int vehicleId)
         {
             var result = GetRemindersAndUrgency(vehicleId, DateTime.Now);
-            //check for past due reminders that are eligible for recurring.
-            var pastDueAndRecurring = result.Where(x => x.Urgency == ReminderUrgency.PastDue && x.IsRecurring);
-            if (pastDueAndRecurring.Any())
+            //check if user wants auto-refresh past-due reminders
+            if (_config.GetUserConfig(User).EnableAutoReminderRefresh)
             {
-                foreach (ReminderRecordViewModel reminderRecord in pastDueAndRecurring)
+                //check for past due reminders that are eligible for recurring.
+                var pastDueAndRecurring = result.Where(x => x.Urgency == ReminderUrgency.PastDue && x.IsRecurring);
+                if (pastDueAndRecurring.Any())
                 {
-                    //update based on recurring intervals.
-                    //pull reminderRecord based on ID
-                    var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(reminderRecord.Id);
-                    if (existingReminder.Metric == ReminderMetric.Both)
+                    foreach (ReminderRecordViewModel reminderRecord in pastDueAndRecurring)
                     {
-                        existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
-                        existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
+                        //update based on recurring intervals.
+                        //pull reminderRecord based on ID
+                        var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(reminderRecord.Id);
+                        existingReminder = _reminderHelper.GetUpdatedRecurringReminderRecord(existingReminder);
+                        //save to db.
+                        _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingReminder);
+                        //set urgency to not urgent so it gets excluded in count.
+                        reminderRecord.Urgency = ReminderUrgency.NotUrgent;
                     }
-                    else if (existingReminder.Metric == ReminderMetric.Odometer)
-                    {
-                        existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
-                    }
-                    else if (existingReminder.Metric == ReminderMetric.Date)
-                    {
-                        existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
-                    }
-                    //save to db.
-                    _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingReminder);
-                    //set urgency to not urgent so it gets excluded in count.
-                    reminderRecord.Urgency = ReminderUrgency.NotUrgent;
                 }
             }
             //check for very urgent or past due reminders that were not eligible for recurring.
@@ -1108,6 +1267,15 @@ namespace CarCareTracker.Controllers
             return PartialView("_ReminderRecords", result);
         }
         [HttpPost]
+        public IActionResult PushbackRecurringReminderRecord(int reminderRecordId)
+        {
+            var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(reminderRecordId);
+            existingReminder = _reminderHelper.GetUpdatedRecurringReminderRecord(existingReminder);
+            //save to db.
+            var result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingReminder);
+            return Json(result);
+        }
+        [HttpPost]
         public IActionResult SaveReminderRecordToVehicleId(ReminderRecordInput reminderRecord)
         {
             var result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(reminderRecord.ToReminderRecord());
@@ -1172,9 +1340,23 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveUpgradeRecordToVehicleId(UpgradeRecordInput upgradeRecord)
         {
+            if (upgradeRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
+            {
+                _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord
+                {
+                    Date = DateTime.Parse(upgradeRecord.Date),
+                    VehicleId = upgradeRecord.VehicleId,
+                    Mileage = upgradeRecord.Mileage,
+                    Notes = $"Auto Insert From Upgrade Record: {upgradeRecord.Description}"
+                });
+            }
             //move files from temp.
             upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord());
+            if (result && upgradeRecord.Supplies.Any())
+            {
+                RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies);
+            }
             return Json(result);
         }
         [HttpGet]
@@ -1213,8 +1395,17 @@ namespace CarCareTracker.Controllers
         public IActionResult GetNotesByVehicleId(int vehicleId)
         {
             var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
+            result = result.OrderByDescending(x => x.Pinned).ToList();
             return PartialView("_Notes", result);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetPinnedNotesByVehicleId(int vehicleId)
+        {
+            var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
+            result = result.Where(x=>x.Pinned).ToList();
+            return Json(result);
+        }
         [HttpPost]
         public IActionResult SaveNoteToVehicleId(Note note)
         {
@@ -1240,6 +1431,21 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Supply Records"
+        private void RequisitionSupplyRecordsByUsage(List<SupplyUsage> supplyUsage)
+        {
+            foreach(SupplyUsage supply in supplyUsage)
+            {
+                //get supply record.
+                var result = _supplyRecordDataAccess.GetSupplyRecordById(supply.SupplyId);
+                var unitCost = (result.Quantity != 0 ) ? result.Cost / result.Quantity : 0;
+                //deduct quantity used.
+                result.Quantity -= supply.Quantity;
+                //deduct cost.
+                result.Cost -= (supply.Quantity * unitCost);
+                //save
+                _supplyRecordDataAccess.SaveSupplyRecordToVehicle(result);
+            }
+        }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
@@ -1256,6 +1462,23 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_SupplyRecords", result);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetSupplyRecordsForRecordsByVehicleId(int vehicleId)
+        {
+            var result = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
+            result.RemoveAll(x => x.Quantity <= 0);
+            bool _useDescending = _config.GetUserConfig(User).UseDescending;
+            if (_useDescending)
+            {
+                result = result.OrderByDescending(x => x.Date).ToList();
+            }
+            else
+            {
+                result = result.OrderBy(x => x.Date).ToList();
+            }
+            return PartialView("_SupplyUsage", result);
+        }
         [HttpPost]
         public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
         {
@@ -1316,6 +1539,10 @@ namespace CarCareTracker.Controllers
             //move files from temp.
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(planRecord.ToPlanRecord());
+            if (result && planRecord.Supplies.Any())
+            {
+                RequisitionSupplyRecordsByUsage(planRecord.Supplies);
+            }
             return Json(result);
         }
         [HttpGet]
@@ -1332,6 +1559,16 @@ namespace CarCareTracker.Controllers
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
             if (planProgress == PlanProgress.Done)
             {
+                if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
+                {
+                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord
+                    {
+                        Date = DateTime.Now,
+                        VehicleId = existingRecord.VehicleId,
+                        Mileage = odometer,
+                        Notes = $"Auto Insert From Plan Record: {existingRecord.Description}"
+                    });
+                }
                 //convert plan record to service/upgrade/repair record.
                 if (existingRecord.ImportMode == ImportMode.ServiceRecord)
                 {
@@ -1459,5 +1696,55 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         #endregion
+        #region "Shared Methods"
+        public IActionResult MoveRecord(int recordId, ImportMode source, ImportMode destination)
+        {
+            var genericRecord = new GenericRecord();
+            bool result = false;
+            //get
+            switch (source)
+            {
+                case ImportMode.ServiceRecord:
+                    genericRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
+                    break;
+                case ImportMode.RepairRecord:
+                    genericRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
+                    break;
+                case ImportMode.UpgradeRecord:
+                    genericRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
+                    break;
+            }
+            //save
+            switch (destination)
+            {
+                case ImportMode.ServiceRecord:
+                    result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(StaticHelper.GenericToServiceRecord(genericRecord));
+                    break;
+                case ImportMode.RepairRecord:
+                    result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(StaticHelper.GenericToRepairRecord(genericRecord));
+                    break;
+                case ImportMode.UpgradeRecord:
+                    result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(StaticHelper.GenericToUpgradeRecord(genericRecord));
+                    break;
+            }
+            //delete
+            if (result)
+            {
+                switch (source)
+                {
+                    case ImportMode.ServiceRecord:
+                        _serviceRecordDataAccess.DeleteServiceRecordById(recordId);
+                        break;
+                    case ImportMode.RepairRecord:
+                        _collisionRecordDataAccess.DeleteCollisionRecordById(recordId);
+                        break;
+                    case ImportMode.UpgradeRecord:
+                        _upgradeRecordDataAccess.DeleteUpgradeRecordById(recordId);
+                        break;
+                }
+            }
+            return Json(result);
+        }
+        #endregion
     }
 }

Enum/ReminderMileageInterval.cs

@@ -2,12 +2,22 @@
 {
     public enum ReminderMileageInterval
     {
+        FiftyMiles = 50,
+        OneHundredMiles = 100,
         FiveHundredMiles = 500,
         OneThousandMiles = 1000,
         ThreeThousandMiles = 3000,
+        FourThousandMiles = 4000,
         FiveThousandMiles = 5000,
         SevenThousandFiveHundredMiles = 7500,
         TenThousandMiles = 10000,
-        FiftyThousandMiles = 50000
+        FifteenThousandMiles = 15000,
+        TwentyThousandMiles = 20000,
+        ThirtyThousandMiles = 30000,
+        FortyThousandMiles = 40000,
+        FiftyThousandMiles = 50000,
+        SixtyThousandMiles = 60000,
+        OneHundredThousandMiles = 100000,
+        OneHundredFiftyThousandMiles = 150000
     }
 }

Enum/ReminderMonthInterval.cs

@@ -2,9 +2,12 @@
 {
     public enum ReminderMonthInterval
     {
+        OneMonth = 1,
         ThreeMonths = 3,
         SixMonths = 6,
         OneYear = 12,
+        TwoYears = 24,
+        ThreeYears = 36,
         FiveYears = 60
     }
 }

Helper/ConfigHelper.cs

@@ -94,7 +94,10 @@ namespace CarCareTracker.Helper
                 EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
                 HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
                 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)]),
                 VisibleTabs = _config.GetSection("VisibleTabs").Get<List<ImportMode>>(),
                 DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
             };

Helper/FileHelper.cs

@@ -1,4 +1,5 @@
-using System.IO.Compression;
+using CarCareTracker.Models;
+using System.IO.Compression;
 
 namespace CarCareTracker.Helper
 {
@@ -8,7 +9,8 @@ namespace CarCareTracker.Helper
         string MoveFileFromTemp(string currentFilePath, string newFolder);
         bool DeleteFile(string currentFilePath);
         string MakeBackup();
-        bool RestoreBackup(string fileName);
+        bool RestoreBackup(string fileName, bool clearExisting = false);
+        string MakeAttachmentsExport(List<GenericReportModel> exportData);
     }
     public class FileHelper : IFileHelper
     {
@@ -38,7 +40,7 @@ namespace CarCareTracker.Helper
                 return string.Empty;
             }
         }
-        public bool RestoreBackup(string fileName)
+        public bool RestoreBackup(string fileName, bool clearExisting = false)
         {
             var fullFilePath = GetFullFilePath(fileName);
             if (string.IsNullOrWhiteSpace(fullFilePath))
@@ -64,9 +66,17 @@ namespace CarCareTracker.Helper
                     {
                         Directory.CreateDirectory(existingPath);
                     }
+                    else if (clearExisting)
+                    {
+                        var filesToDelete = Directory.GetFiles(existingPath);
+                        foreach (string file in filesToDelete)
+                        {
+                            File.Delete(file);
+                        }
+                    }
                     //copy each files from temp folder to newPath
                     var filesToUpload = Directory.GetFiles(imagePath);
-                    foreach(string file in filesToUpload)
+                    foreach (string file in filesToUpload)
                     {
                         File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}", true);
                     }
@@ -78,6 +88,14 @@ namespace CarCareTracker.Helper
                     {
                         Directory.CreateDirectory(existingPath);
                     }
+                    else if (clearExisting)
+                    {
+                        var filesToDelete = Directory.GetFiles(existingPath);
+                        foreach (string file in filesToDelete)
+                        {
+                            File.Delete(file);
+                        }
+                    }
                     //copy each files from temp folder to newPath
                     var filesToUpload = Directory.GetFiles(documentPath);
                     foreach (string file in filesToUpload)
@@ -100,12 +118,37 @@ namespace CarCareTracker.Helper
                     File.Move(configPath, StaticHelper.UserConfigPath, true);
                 }
                 return true;
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 _logger.LogError(ex, $"Error Restoring Database Backup: {ex.Message}");
                 return false;
             }
         }
+        public string MakeAttachmentsExport(List<GenericReportModel> exportData)
+        {
+            var folderName = Guid.NewGuid();
+            var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{folderName}");
+            if (!Directory.Exists(tempPath))
+                Directory.CreateDirectory(tempPath);
+            int fileIndex = 0;
+            foreach(GenericReportModel reportModel in exportData)
+            {
+                foreach(UploadedFiles file in reportModel.Files)
+                {
+                    var fileToCopy = GetFullFilePath(file.Location);
+                    var destFileName = $"{tempPath}/{fileIndex}{Path.GetExtension(file.Location)}";
+                    File.Copy(fileToCopy, destFileName);
+                    fileIndex++;
+                }
+            }
+            var destFilePath = $"{tempPath}.zip";
+            ZipFile.CreateFromDirectory(tempPath, destFilePath);
+            //delete temp directory
+            Directory.Delete(tempPath, true);
+            var zipFileName = $"/temp/{folderName}.zip";
+            return zipFileName;
+        }
         public string MakeBackup()
         {
             var folderName = $"db_backup_{DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}";

Helper/GasHelper.cs

@@ -5,11 +5,33 @@ namespace CarCareTracker.Helper
     public interface IGasHelper
     {
         List<GasRecordViewModel> GetGasRecordViewModels(List<GasRecord> result, bool useMPG, bool useUKMPG);
+        string GetAverageGasMileage(List<GasRecordViewModel> results, bool useMPG);
     }
     public class GasHelper : IGasHelper
     {
+        public string GetAverageGasMileage(List<GasRecordViewModel> results, bool useMPG)
+        {
+            var recordsToCalculateGallons = results.Where(x => x.MilesPerGallon > 0 || !x.IsFillToFull);
+            var recordWithCalculatedMPG = recordsToCalculateGallons.Where(x => x.MilesPerGallon > 0);
+            var minMileage = results.Min(x => x.Mileage);
+            if (recordWithCalculatedMPG.Any())
+            {
+                var maxMileage = recordWithCalculatedMPG.Max(x => x.Mileage);
+                var totalGallonsConsumed = recordsToCalculateGallons.Sum(x => x.Gallons);
+                var deltaMileage = maxMileage - minMileage;
+                var averageGasMileage = (maxMileage - minMileage) / totalGallonsConsumed;
+                if (!useMPG)
+                {
+                    averageGasMileage = 100 / averageGasMileage;
+                }
+                return averageGasMileage.ToString("F");
+            }
+            return "0";
+        }
         public List<GasRecordViewModel> GetGasRecordViewModels(List<GasRecord> result, bool useMPG, bool useUKMPG)
         {
+            //need to order by to get correct results
+            result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
             var computedResults = new List<GasRecordViewModel>();
             int previousMileage = 0;
             decimal unFactoredConsumption = 0.00M;

Helper/MailHelper.cs

@@ -8,6 +8,7 @@ namespace CarCareTracker.Helper
     {
         OperationResponse NotifyUserForRegistration(string emailAddress, string token);
         OperationResponse NotifyUserForPasswordReset(string emailAddress, string token);
+        OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders);
     }
     public class MailHelper : IMailHelper
     {
@@ -60,20 +61,62 @@ namespace CarCareTracker.Helper
                 return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
-        private bool SendEmail(string emailTo, string emailSubject, string emailBody) {
+        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" };
+            }
+            if (!emailAddresses.Any())
+            {
+                return new OperationResponse { Success = false, Message = "No recipients could be found" };
+            }
+            if (!reminders.Any())
+            {
+                return new OperationResponse { Success = false, Message = "No reminders could be found" };
+            }
+            string emailSubject = $"Vehicle Reminders From LubeLogger - {DateTime.Now.ToShortDateString()}";
+            //construct html table.
+            string emailBody = $"<h4>{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate}</h4><br /><table style='width:100%'><tr><th style='padding:8px;'>Urgency</th><th style='padding:8px;'>Description</th></tr>";
+            foreach(ReminderRecordViewModel reminder in reminders)
+            {
+                emailBody += $"<tr><td style='padding:8px; text-align:center;'>{reminder.Urgency}</td><td style='padding:8px; text-align:center;'>{reminder.Description}</td></tr>";
+            }
+            emailBody += "</table>";
+            try
+            {
+                foreach (string emailAddress in emailAddresses)
+                {
+                    SendEmail(emailAddress, emailSubject, emailBody, true, true);
+                }
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
+            } catch (Exception ex)
+            {
+                return new OperationResponse { Success = false, Message = ex.Message };
+            }
+        }
+        private bool SendEmail(string emailTo, string emailSubject, string emailBody, bool isBodyHtml = false, bool useAsync = false) {
             string to = emailTo;
             string from = mailConfig.EmailFrom;
             var server = mailConfig.EmailServer;
             MailMessage message = new MailMessage(from, to);
             message.Subject = emailSubject;
             message.Body = emailBody;
+            message.IsBodyHtml = isBodyHtml;
             SmtpClient client = new SmtpClient(server);
             client.EnableSsl = mailConfig.UseSSL;
             client.Port = mailConfig.Port;
             client.Credentials = new NetworkCredential(mailConfig.Username, mailConfig.Password);
             try
             {
-                client.Send(message);
+                if (useAsync)
+                {
+                    client.SendMailAsync(message, new CancellationToken());
+                }
+                else
+                {
+                    client.Send(message);
+                }
                 return true;
             }
             catch (Exception ex)

Helper/ReminderHelper.cs

@@ -4,10 +4,28 @@ namespace CarCareTracker.Helper
 {
     public interface IReminderHelper
     {
+        ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder);
         List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare);
     }
     public class ReminderHelper: IReminderHelper
     {
+        public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder)
+        {
+            if (existingReminder.Metric == ReminderMetric.Both)
+            {
+                existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
+            }
+            else if (existingReminder.Metric == ReminderMetric.Odometer)
+            {
+                existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
+            }
+            else if (existingReminder.Metric == ReminderMetric.Date)
+            {
+                existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+            }
+            return existingReminder;
+        }
         public List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare)
         {
             List<ReminderRecordViewModel> reminderViewModels = new List<ReminderRecordViewModel>();

Helper/StaticHelper.cs

@@ -1,4 +1,5 @@
 using CarCareTracker.Models;
+using System.Globalization;
 
 namespace CarCareTracker.Helper
 {
@@ -63,5 +64,81 @@ namespace CarCareTracker.Helper
             }
             return "";
         }
+        public static List<CostForVehicleByMonth> GetBaseLineCosts()
+        {
+            return new List<CostForVehicleByMonth>()
+            {
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(1), MonthId = 1, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(2), MonthId = 2, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(3), MonthId = 3, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(4), MonthId = 4, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(5), MonthId = 5, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(6), MonthId = 6, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(7), MonthId = 7, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(8), MonthId = 8, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(9), MonthId = 9, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(10), MonthId = 10, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(11), MonthId = 11, Cost = 0M},
+                new CostForVehicleByMonth {MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(12), MonthId = 12, Cost = 0M}
+            };
+        }
+        public static List<CostForVehicleByMonth> GetBaseLineCostsNoMonthName()
+        {
+            return new List<CostForVehicleByMonth>()
+            {
+                new CostForVehicleByMonth { MonthId = 1, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 2, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 3, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 4, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 5, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 6, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 7, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 8, Cost = 0M},
+                new CostForVehicleByMonth {MonthId = 9, Cost = 0M},
+                new CostForVehicleByMonth { MonthId = 10, Cost = 0M},
+                new CostForVehicleByMonth { MonthId = 11, Cost = 0M},
+                new CostForVehicleByMonth { MonthId = 12, Cost = 0M}
+            };
+        }
+
+        public static ServiceRecord GenericToServiceRecord(GenericRecord input)
+        {
+            return new ServiceRecord
+            {
+                VehicleId = input.VehicleId,
+                Date = input.Date,
+                Description = input.Description,
+                Cost = input.Cost,
+                Mileage = input.Mileage,
+                Files = input.Files,
+                Notes = input.Notes
+            };
+        }
+        public static CollisionRecord GenericToRepairRecord(GenericRecord input)
+        {
+            return new CollisionRecord
+            {
+                VehicleId = input.VehicleId,
+                Date = input.Date,
+                Description = input.Description,
+                Cost = input.Cost,
+                Mileage = input.Mileage,
+                Files = input.Files,
+                Notes = input.Notes
+            };
+        }
+        public static UpgradeRecord GenericToUpgradeRecord(GenericRecord input)
+        {
+            return new UpgradeRecord
+            {
+                VehicleId = input.VehicleId,
+                Date = input.Date,
+                Description = input.Description,
+                Cost = input.Cost,
+                Mileage = input.Mileage,
+                Files = input.Files,
+                Notes = input.Notes
+            };
+        }
     }
 }

Models/Collision/CollisionRecord.cs

@@ -1,14 +1,6 @@
 namespace CarCareTracker.Models
 {
-    public class CollisionRecord
+    public class CollisionRecord: GenericRecord
     {
-        public int Id { get; set; }
-        public int VehicleId { get; set; }
-        public DateTime Date { get; set; }
-        public int Mileage { get; set; }
-        public string Description { get; set; }
-        public decimal Cost { get; set; }
-        public string Notes { get; set; }
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/Collision/CollisionRecordInput.cs

@@ -10,6 +10,7 @@
         public decimal Cost { get; set; }
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public CollisionRecord ToCollisionRecord() { return new CollisionRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; }
     }
 }

Models/GasRecord/GasRecordInputContainer.cs

@@ -2,7 +2,8 @@
 {
     public class GasRecordInputContainer
     {
-       public bool UseKwh { get; set; }
-       public GasRecordInput GasRecord { get; set; }
+        public bool UseKwh { get; set; }
+        public bool UseHours { get; set; }
+        public GasRecordInput GasRecord { get; set; }
     }
 }

Models/GasRecord/GasRecordViewModelContainer.cs

@@ -2,7 +2,8 @@
 {
     public class GasRecordViewModelContainer
     {
-       public bool UseKwh { get; set; }
-       public List<GasRecordViewModel> GasRecords { get; set; } = new List<GasRecordViewModel>();
+        public bool UseKwh { get; set; }
+        public bool UseHours { get; set; }
+        public List<GasRecordViewModel> GasRecords { get; set; } = new List<GasRecordViewModel>();
     }
 }

Models/GenericRecord.cs

@@ -0,0 +1,14 @@
+namespace CarCareTracker.Models
+{
+    public class GenericRecord
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        public DateTime Date { get; set; }
+        public int Mileage { get; set; }
+        public string Description { get; set; }
+        public decimal Cost { get; set; }
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+    }
+}

Models/ImportModel.cs

@@ -53,7 +53,6 @@
     public class TaxRecordExportModel
     {
         public string Date { get; set; }
-        public string Odometer { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
         public string Cost { get; set; }

Models/Note.cs

@@ -6,5 +6,6 @@
         public int VehicleId { get; set; }
         public string Description { get; set; }
         public string NoteText { get; set; }
+        public bool Pinned { get; set; }
     }
 }

Models/PlanRecord/PlanRecordInput.cs

@@ -9,6 +9,7 @@
         public string Description { get; set; }
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public ImportMode ImportMode { get; set; }
         public PlanPriority Priority { get; set; }
         public PlanProgress Progress { get; set; }

Models/Report/GenericReportModel.cs

@@ -11,5 +11,6 @@
         public string Description { get; set; }
         public string Notes { get; set; }
         public decimal Cost { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/Report/VehicleHistoryViewModel.cs

@@ -5,7 +5,7 @@
         public Vehicle VehicleData { get; set; }
         public List<GenericReportModel> VehicleHistory { get; set; }
         public string Odometer { get; set; }
-        public decimal MPG { get; set; }
+        public string MPG { get; set; }
         public decimal TotalCost { get; set; }
         public decimal TotalGasCost { get; set; }
     }

Models/ServiceRecord/ServiceRecord.cs

@@ -1,14 +1,6 @@
 namespace CarCareTracker.Models
 {
-    public class ServiceRecord
+    public class ServiceRecord: GenericRecord
     {
-        public int Id { get; set; }
-        public int VehicleId { get; set; }
-        public DateTime Date { get; set; }
-        public int Mileage { get; set; }
-        public string Description { get; set; }
-        public decimal Cost { get; set; }
-        public string Notes { get; set; }
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/ServiceRecord/ServiceRecordInput.cs

@@ -10,6 +10,7 @@
         public decimal Cost { get; set; }
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public ServiceRecord ToServiceRecord() { return new ServiceRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; }
     }
 }

Models/Supply/SupplyUsage.cs

@@ -0,0 +1,7 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyUsage { 
+        public int SupplyId { get; set; }
+        public decimal Quantity { get; set; }
+    }
+}

Models/TaxRecord/TaxRecord.cs

@@ -8,6 +8,8 @@
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }
+        public bool IsRecurring { get; set; } = false;
+        public ReminderMonthInterval RecurringInterval { get; set; } = ReminderMonthInterval.OneYear;
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/TaxRecord/TaxRecordInput.cs

@@ -8,7 +8,18 @@
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }
+        public bool IsRecurring { get; set; } = false;
+        public ReminderMonthInterval RecurringInterval { get; set; } = ReminderMonthInterval.ThreeMonths;
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
-        public TaxRecord ToTaxRecord() { return new TaxRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Description = Description, Notes = Notes, Files = Files }; }
+        public TaxRecord ToTaxRecord() { return new TaxRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            Date = DateTime.Parse(Date), 
+            Cost = Cost, 
+            Description = Description, 
+            Notes = Notes, 
+            IsRecurring = IsRecurring,
+            RecurringInterval = RecurringInterval,
+            Files = Files }; }
     }
 }

Models/UpgradeRecord/UpgradeRecord.cs

@@ -1,14 +1,6 @@
 namespace CarCareTracker.Models
 {
-    public class UpgradeRecord
+    public class UpgradeRecord: GenericRecord
     {
-        public int Id { get; set; }
-        public int VehicleId { get; set; }
-        public DateTime Date { get; set; }
-        public int Mileage { get; set; }
-        public string Description { get; set; }
-        public decimal Cost { get; set; }
-        public string Notes { get; set; }
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -10,6 +10,7 @@
         public decimal Cost { get; set; }
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; }
     }
 }

Models/UserConfig.cs

@@ -10,6 +10,9 @@
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
         public bool UseThreeDecimalGasCost { get; set; }
+        public bool UseMarkDownOnSavedNotes { get; set; }
+        public bool EnableAutoReminderRefresh { get; set; }
+        public bool EnableAutoOdometerInsert { get; set; }
         public string UserNameHash { get; set; }
         public string UserPasswordHash { get; set;}
         public List<ImportMode> VisibleTabs { get; set; } = new List<ImportMode>() { 

Models/Vehicle.cs

@@ -9,5 +9,6 @@
         public string Model { get; set; }
         public string LicensePlate { get; set; }
         public bool IsElectric { get; set; } = false;
+        public bool UseHours { get; set; } = false;
     }
 }

README.md

@@ -2,6 +2,8 @@
 
 A self-hosted, open-source vehicle service records and maintainence tracker.
 
+Visit our website: https://lubelogger.com
+
 Support this project on Patreon: https://patreon.com/LubeLogger
 
 ## Why
@@ -10,6 +12,11 @@ Because nobody should have to deal with a homemade spreadsheet or a shoebox full
 ## Screenshots
 <a href="/docs/screenshots.md">Screenshots</a>
 
+## Demo
+Try it out before you download it! The live demo resets every 20 minutes.
+
+[Live Demo](https://demo.lubelogger.com) Login using username "test" and password "1234"
+
 ## Dependencies
 - Bootstrap
 - LiteDB
@@ -17,12 +24,13 @@ Because nobody should have to deal with a homemade spreadsheet or a shoebox full
 - SweetAlert2
 - CsvHelper
 - Chart.js
+- Drawdown
 
 ## Docker Setup (GHCR)
 1. Install Docker
 2. Run `docker pull ghcr.io/hargata/lubelogger:latest`
 3. CHECK culture in .env file, default is en_US, this will change the currency and date formats. You can also setup SMTP Config here.
-4. If not using traefik, use docker-compose-notraefik.yml
+4. If using traefik, use docker-compose.traefik.yml
 5. Run `docker-compose up`
 
 ## Docker Setup (Manual Build)
@@ -31,7 +39,7 @@ Because nobody should have to deal with a homemade spreadsheet or a shoebox full
 3. CHECK culture in .env file, default is en_US, also setup SMTP for user management if you want that.
 4. Run `docker build -t lubelogger -f Dockerfile .`
 5. CHECK docker-compose.yml and make sure the mounting directories look correct.
-6. If not using traefik, use docker-compose-notraefik.yml
+6. If using traefik, use docker-compose.traefik.yml
 7. Run `docker-compose up`
 
 ## Additional Docker Instructions

Views/API/Index.cshtml

@@ -1,4 +1,7 @@
-<div class="row">
+@{
+    ViewData["Title"] = "LubeLogger API";
+}
+<div class="row">
     <div class="d-flex justify-content-center">
         <h6 class="display-6 mt-2">API</h6>
     </div>
@@ -51,6 +54,28 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/servicerecords/add</code>
+    </div>
+    <div class="col-3">
+        Adds Service Record to the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        Body(form-data): {<br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        description - Description<br/>
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        }
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         GET
@@ -65,6 +90,28 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/repairrecords/add</code>
+    </div>
+    <div class="col-3">
+        Adds Repair Record to the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        Body(form-data): {<br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        }
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         GET
@@ -79,6 +126,28 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/upgraderecords/add</code>
+    </div>
+    <div class="col-3">
+        Adds Upgrade Record to the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        Body(form-data): {<br />
+        date - Date to be entered<br />
+        odometer - Odometer reading<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        }
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         GET
@@ -93,6 +162,27 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/taxrecords/add</code>
+    </div>
+    <div class="col-3">
+        Adds Tax Record to the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        Body(form-data): {<br />
+        date - Date to be entered<br />
+        description - Description<br />
+        cost - Cost<br />
+        notes - notes(optional)<br />
+        }
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         GET
@@ -111,6 +201,30 @@
         useUKMPG(bool) - Use UK Imperial Calculation
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/gasrecords/add</code>
+    </div>
+    <div class="col-3">
+        Adds Gas Record to the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        Body(form-data): {<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 />
+        }
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         GET
@@ -127,6 +241,21 @@
 </div>
 @if (User.IsInRole(nameof(UserData.IsRootUser)))
 {
+    <div class="row">
+        <div class="col-1">
+            GET
+        </div>
+        <div class="col-5">
+            <code>/api/vehicle/reminders/send</code>
+        </div>
+        <div class="col-3">
+            Send reminder emails out to collaborators based on specified urgency.
+        </div>
+        <div class="col-3">
+            (must be root user)<br />
+            urgencies[]=[NotUrgent,Urgent,VeryUrgent,PastDue]
+        </div>
+    </div>
     <div class="row">
         <div class="col-1">
             GET
@@ -164,7 +293,7 @@
         <code>/api/vehicle/odometerrecords/add</code>
     </div>
     <div class="col-3">
-        Returns a list of odometer records for the vehicle
+        Adds Odometer Record to the vehicle
     </div>
     <div class="col-3">
         vehicleId - Id of Vehicle

Views/Home/_GarageDisplay.cshtml

@@ -4,7 +4,7 @@
 {
     foreach (Vehicle vehicle in Model)
     {
-        <div class="col-xl-2 col-lg-4 col-md-4 col-sm-4 col-4">
+        <div class="col-xl-2 col-lg-4 col-md-4 col-sm-4 col-4 user-select-none" id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" 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;" />
                 <div class="card-body">

Views/Home/_Settings.cshtml

@@ -35,6 +35,18 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UseThreeDecimalGasCost">
             <label class="form-check-label" for="useThreeDecimal">Use Three Decimals For Fuel Cost</label>
         </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useMarkDownOnSavedNotes" checked="@Model.UseMarkDownOnSavedNotes">
+            <label class="form-check-label" for="useMarkDownOnSavedNotes">Display Saved Notes in Markdown</label>
+        </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableAutoReminderRefresh" checked="@Model.EnableAutoReminderRefresh">
+            <label class="form-check-label" for="enableAutoReminderRefresh">Auto Refresh Lapsed Recurring Reminders</label>
+        </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableAutoOdometerInsert" checked="@Model.EnableAutoOdometerInsert">
+            <label class="form-check-label" for="enableAutoOdometerInsert">Auto Insert Odometer Records<br /><small class="text-body-secondary">Only when Adding Service/Repair/Upgrade/Fuel Record or Completing a Plan</small></label>
+        </div>
         @if (User.IsInRole(nameof(UserData.IsRootUser)))
         {
             <div class="form-check form-switch">
@@ -146,7 +158,7 @@
             <img src="/defaults/lubelogger_logo.png" />
         </div>
         <div class="d-flex justify-content-center">
-            <small class="text-body-secondary">Version 1.0.6</small>
+            <small class="text-body-secondary">Version 1.1.0</small>
         </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.
@@ -179,6 +191,7 @@
             <li class="list-group-item">SweetAlert2</li>
             <li class="list-group-item">CsvHelper</li>
             <li class="list-group-item">Chart.js</li>
+            <li class="list-group-item">Drawdown</li>
         </ul>
     </div>
 </div>
@@ -203,6 +216,9 @@
             hideZero: $("#hideZero").is(":checked"),
             useUKMpg: $("#useUKMPG").is(":checked"),
             useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
+            useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
+            enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
+            enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
             visibleTabs: visibleTabs,
             defaultTab: defaultTab
         }

Views/Shared/_Layout.cshtml

@@ -5,7 +5,9 @@
     var userConfig = config.GetUserConfig(User);
     var useDarkMode = userConfig.UseDarkMode;
     var enableCsvImports = userConfig.EnableCsvImports;
+    var useMarkDown = userConfig.UseMarkDownOnSavedNotes;
     var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+    var numberFormat = System.Globalization.CultureInfo.CurrentCulture.NumberFormat;
     shortDatePattern = shortDatePattern.ToLower();
     if (!shortDatePattern.Contains("dd"))
     {
@@ -46,7 +48,8 @@
         function getGlobalConfig() {
             return {
                 useDarkMode : "@useDarkMode" == "True",
-                enableCsvImport : "@enableCsvImports" == "True"
+                enableCsvImport : "@enableCsvImports" == "True",
+                useMarkDown: "@useMarkDown" == "True"
             }
         }
         function getShortDatePattern() {
@@ -54,6 +57,27 @@
                 pattern: "@shortDatePattern"
             }
         }
+        function globalParseFloat(input){
+            //remove thousands separator.
+            var thousandSeparator = "@numberFormat.NumberGroupSeparator";
+            var decimalSeparator = "@numberFormat.NumberDecimalSeparator";
+            var currencySymbol = "@numberFormat.CurrencySymbol";
+            if (input == "---") {
+                input = "0";
+            }
+            //strip thousands from input.
+            input = input.replace(thousandSeparator, "");
+            //convert to JS format where decimal is only separated by .
+            input = input.replace(decimalSeparator, ".");
+            //remove any currency symbol
+            input = input.replace(currencySymbol, "");
+            return parseFloat(input);
+        }
+        function globalFloatToString(input) {
+            var decimalSeparator = "@numberFormat.NumberDecimalSeparator";
+            input = input.replace(".", decimalSeparator);
+            return input;
+        }
     </script>
     @await RenderSectionAsync("Scripts", required: false)
 </head>

Views/Vehicle/Index.cshtml

@@ -21,6 +21,7 @@
     <script src="~/js/planrecord.js" asp-append-version="true"></script>
     <script src="~/js/odometerrecord.js" asp-append-version="true"></script>
     <script src="~/lib/chart-js/chart.umd.js"></script>
+    <script src="~/lib/drawdown/drawdown.js"></script>
 }
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
     <ul class="nav navbar-nav" id="vehicleTab" role="tablist">
@@ -153,6 +154,11 @@
         </div>
     </div>
 </div>
+<div class="modal fade" data-bs-focus="false" id="inputSuppliesModal" tabindex="-1" role="dialog" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="inputSuppliesModalContent"></div>
+    </div>
+</div>
 <script>
     function GetVehicleId() {
         return { vehicleId: @Model.Id};

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -23,9 +23,13 @@
                     <input type="text" id="collisionRecordDescription" class="form-control" placeholder="Description of item(s) repaired(i.e. Alternator)" value="@Model.Description">
                     <label for="collisionRecordCost">Cost</label>
                     <input type="text" id="collisionRecordCost" class="form-control" placeholder="Cost of the repair" value="@(isNew ? "" : Model.Cost)">
+                    @if (isNew)
+                    {
+                        @await Html.PartialAsync("_SupplyStore", "RepairRecord")
+                    }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="collisionRecordNotes">Notes(optional)</label>
+                    <label for="collisionRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="collisionRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
@@ -33,6 +37,7 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="collisionRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="collisionRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
@@ -48,6 +53,7 @@
                         }
                         <label for="collisionRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="collisionRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>
@@ -57,7 +63,17 @@
 <div class="modal-footer">
     @if (!isNew)
     {
-        <button type="button" class="btn btn-danger" onclick="deleteCollisionRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+        <div class="btn-group" style="margin-right:auto;">
+            <button type="button" class="btn btn-md mt-1 mb-1 btn-danger" onclick="deleteCollisionRecord(@Model.Id)">Delete</button>
+            <button type="button" class="btn btn-md btn-danger 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><h6 class="dropdown-header">Move To</h6></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'RepairRecord', 'ServiceRecord')">Service Records</a></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'RepairRecord', 'UpgradeRecord')">Upgrades</a></li>
+            </ul>
+        </div>
     }
     <button type="button" class="btn btn-secondary" onclick="hideAddCollisionRecordModal()">Cancel</button>
     @if (isNew)
@@ -71,6 +87,7 @@
 </div>
 <script>
     var uploadedFiles = [];
+    var selectedSupplies = [];
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)

Views/Vehicle/_CollisionRecords.cshtml

@@ -22,6 +22,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('RepairRecord')">Import via CSV</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('RepairRecord')">Export to CSV</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                     </ul>
                 </div>
             }
@@ -45,7 +47,7 @@
                     <th scope="col" class="col-2 col-xl-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
                     <th scope="col" class="col-3 col-xl-4">Description</th>
-                    <th scope="col" class="col-2">Cost</th>
+                    <th scope="col" class="col-2" onclick="toggleSort('accident-tab-pane', this)" style="cursor:pointer;">Cost</th>
                     <th scope="col" class="col-3">Notes</th>
                 </tr>
             </thead>

Views/Vehicle/_CostMakeUpReport.cshtml

@@ -12,14 +12,14 @@
                     labels: ["Service Records", "Repairs", "Upgrades", "Tax", "Fuel"],
                     datasets: [
                         {
-                            label: "Expenses by Category",
+                            label: "Expenses by Type",
                             backgroundColor: ["#003f5c", "#58508d", "#bc5090", "#ff6361", "#ffa600"],
                             data: [
-        @Model.ServiceRecordSum,
-        @Model.CollisionRecordSum,
-        @Model.UpgradeRecordSum,
-        @Model.TaxRecordSum,
-        @Model.GasRecordSum
+                                globalParseFloat('@Model.ServiceRecordSum'),
+                                globalParseFloat('@Model.CollisionRecordSum'),
+                                globalParseFloat('@Model.UpgradeRecordSum'),
+                                globalParseFloat('@Model.TaxRecordSum'),
+                                globalParseFloat('@Model.GasRecordSum')
                                         ]
                         }
                     ]

Views/Vehicle/_Gas.cshtml

@@ -1,5 +1,6 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
+@inject IGasHelper gasHelper
 @model GasRecordViewModelContainer
 @{
     var userConfig = config.GetUserConfig(User);
@@ -10,28 +11,29 @@
     var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
     var gasCostFormat = useThreeDecimals ? "C3" : "C2";
     var useKwh = Model.UseKwh;
+    var useHours = Model.UseHours;
     string consumptionUnit;
     string fuelEconomyUnit;
-    string distanceUnit = useMPG ? "mi." : "km";
+    string distanceUnit = useHours ? "h" : (useMPG ? "mi." : "km");
     if (useKwh)
     {
         consumptionUnit = "kWh";
-        fuelEconomyUnit = useMPG ? "mi./kWh" : "kWh/100km";
+        fuelEconomyUnit = useMPG ? $"{distanceUnit}/kWh" : $"kWh/100{distanceUnit}";
     }
     else if (useMPG && useUKMPG)
     {
         consumptionUnit = "imp gal";
-        fuelEconomyUnit = "mpg";
+        fuelEconomyUnit = useHours ? "h/g" : "mpg";
     } else if (useUKMPG)
     {
-        fuelEconomyUnit = "l/100mi.";
+        fuelEconomyUnit = useHours ? "l/100h" : "l/100mi.";
         consumptionUnit = "l";
-        distanceUnit = "mi.";
+        distanceUnit = useHours ? "h" : "mi.";
     }
     else
     {
         consumptionUnit = useMPG ? "US gal" : "l";
-        fuelEconomyUnit = useMPG ? "mpg" : "l/100km";
+        fuelEconomyUnit = useHours ? (useMPG ? "h/g" : "l/100h") : (useMPG ? "mpg" : "l/100km");
     }
 }
 <div class="row">
@@ -40,7 +42,7 @@
             <span class="ms-2 badge bg-success">@($"# of Gas Records: {Model.GasRecords.Count()}")</span>
             @if (Model.GasRecords.Where(x => x.MilesPerGallon > 0).Any())
             {
-                <span class="ms-2 badge bg-primary">@($"Average Fuel Economy: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Average(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
+                <span class="ms-2 badge bg-primary">@($"Average Fuel Economy: {gasHelper.GetAverageGasMileage(Model.GasRecords, useMPG)}")</span>
                 <span class="ms-2 badge bg-primary">@($"Min Fuel Economy: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
                 <span class="ms-2 badge bg-primary">@($"Max Fuel Economy: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
             }
@@ -57,6 +59,8 @@
                 <ul class="dropdown-menu">
                     <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('GasRecord')">Import via CSV</a></li>
                     <li><a class="dropdown-item" href="#" onclick="exportVehicleData('GasRecord')">Export to CSV</a></li>
+                    <li><hr class="dropdown-divider"></li>
+                    <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                 </ul>
             </div>
         } else {
@@ -76,10 +80,10 @@
                 <tr class="d-flex">
                     <th scope="col" class="col-2">Date Refueled</th>
                     <th scope="col" class="col-2">Odometer(@(distanceUnit))</th>
-                    <th scope="col" class="col-2">Consumption(@(consumptionUnit))</th>
-                    <th scope="col" class="col-4">Fuel Economy(@(fuelEconomyUnit))</th>
-                    <th scope="col" class="col-1">Cost</th>
-                    <th scope="col" class="col-1">Unit Cost</th>
+                    <th scope="col" class="col-2" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">Consumption(@(consumptionUnit))</th>
+                    <th scope="col" class="col-4" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">Fuel Economy(@(fuelEconomyUnit))</th>
+                    <th scope="col" class="col-1" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">Cost</th>
+                    <th scope="col" class="col-1" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">Unit Cost</th>
                 </tr>
             </thead>
             <tbody>

Views/Vehicle/_GasCostByMonthReport.cshtml

@@ -1,5 +1,9 @@
 @model List<CostForVehicleByMonth>
-@if (Model.Any())
+@{
+    var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" };
+    var sortedByMPG = Model.OrderBy(x => x.Cost).ToList();
+}
+@if (Model.Where(x=>x.Cost > 0).Any())
 {
     <canvas id="bar-chart"></canvas>
     <script>
@@ -7,11 +11,15 @@
         function renderChart() {
             var barGraphLabels = [];
             var barGraphData = [];
+            //color gradient from high to low
+            var barGraphColors = [];
             var useDarkMode = getGlobalConfig().useDarkMode;
         @foreach (CostForVehicleByMonth gasCost in Model)
         {
             @:barGraphLabels.push("@gasCost.MonthName");
-            @:barGraphData.push(@gasCost.Cost);
+            @:barGraphData.push(globalParseFloat('@gasCost.Cost'));
+            var index = sortedByMPG.FindIndex(x => x.MonthName == gasCost.MonthName);
+            @:barGraphColors.push('@barGraphColors[index]');
         }
                 new Chart($("#bar-chart"), {
                     type: 'bar',
@@ -20,14 +28,20 @@
                         datasets: [
                             {
                                 label: "Expenses by Month",
-                                backgroundColor: ["#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f"],
+                                backgroundColor: barGraphColors,
                                 data: barGraphData
                             }
                         ]
                     },
                     options: {
                         plugins: {
+                            title: {
+                                display: true,
+                                color: useDarkMode ? "#fff" : "#000",
+                                text: 'Expenses by Month'
+                            },
                             legend: {
+                                display: false,
                                 labels: {
                                     color: useDarkMode ? "#fff" : "#000"
                                 }

Views/Vehicle/_GasModal.cshtml

@@ -5,6 +5,7 @@
     var useMPG = config.GetUserConfig(User).UseMPG;
     var useUKMPG = config.GetUserConfig(User).UseUKMPG;
     var useKwh = Model.UseKwh;
+    var useHours = Model.UseHours;
     var isNew = Model.GasRecord.Id == 0;
     string consumptionUnit;
     string distanceUnit;
@@ -19,7 +20,11 @@
     {
         consumptionUnit = useMPG ? "gallons" : "liters";
     }
-    if (useUKMPG)
+    if (useHours)
+    {
+        distanceUnit = "hours";
+    }
+    else if (useUKMPG)
     {
         distanceUnit = "miles";
     }
@@ -73,7 +78,7 @@
                     }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="gasRecordNotes">Notes(optional)</label>
+                    <label for="gasRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="gasRecordNotes" class="form-control" rows="5">@Model.GasRecord.Notes</textarea>
                     @if (Model.GasRecord.Files.Any())
                     {
@@ -81,12 +86,14 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.GasRecord.Files)
                             <label for="gasRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="gasRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
                     {
                         <label for="gasRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="gasRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>

Views/Vehicle/_MPGByMonthReport.cshtml

@@ -1,33 +1,48 @@
 @model List<CostForVehicleByMonth>
-@if (Model.Any())
+@{
+        var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" };
+        var sortedByMPG = Model.OrderByDescending(x => x.Cost).ToList();
+}
+@if (Model.Where(x=>x.Cost > 0).Any())
 {
+    
     <canvas id="bar-chart-mpg"></canvas>
     <script>
         renderChart();
         function renderChart() {
-            var barGraphLabels = [];
-            var barGraphData = [];
-            var useDarkMode = getGlobalConfig().useDarkMode;
+        var barGraphLabels = [];
+        var barGraphData = [];
+        //color gradient from high to low
+        var barGraphColors = [];
+        var useDarkMode = getGlobalConfig().useDarkMode;
         @foreach (CostForVehicleByMonth gasCost in Model)
         {
             @:barGraphLabels.push("@gasCost.MonthName");
-            @:barGraphData.push(@gasCost.Cost);
+            @:barGraphData.push(globalParseFloat('@gasCost.Cost'));
+            var index = sortedByMPG.FindIndex(x => x.MonthName == gasCost.MonthName);
+            @:barGraphColors.push('@barGraphColors[index]');
         }
-                new Chart($("#bar-chart-mpg"), {
+        new Chart($("#bar-chart-mpg"), {
                     type: 'bar',
                     data: {
                         labels: barGraphLabels,
                         datasets: [
                             {
                                 label: "Fuel Mileage by Month",
-                                backgroundColor: ["#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f"],
+                                backgroundColor: barGraphColors,
                                 data: barGraphData
                             }
                         ]
                     },
                     options: {
                         plugins: {
+                            title: {
+                                display: true,
+                                color: useDarkMode ? "#fff" : "#000",
+                                text: 'Fuel Mileage by Month'
+                            },
                             legend: {
+                                display: false,
                                 labels: {
                                     color: useDarkMode ? "#fff" : "#000"
                                 }

Views/Vehicle/_NoteModal.cshtml

@@ -12,11 +12,15 @@
             <div class="row">
                 <div class="col-12">
                     <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="noteIsPinned" checked="@Model.Pinned">
+                        <label class="form-check-label" for="noteIsPinned">Pinned</label>
+                    </div>
                     <label for="noteDescription">Description</label>
                     <input type="text" id="noteDescription" class="form-control" placeholder="Description of the note" value="@(isNew ? "" : Model.Description)">
                 </div>
                 <div class="col-12">
-                    <label for="noteTextArea">Notes</label>
+                    <label for="noteTextArea">Notes<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea class="form-control vehicleNoteContainer" id="noteTextArea">@Model.NoteText</textarea>
                 </div>
             </div>

Views/Vehicle/_Notes.cshtml

@@ -27,7 +27,13 @@
                 @foreach (Note note in Model)
                 {
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditNoteModal(@note.Id)">
-                        <td class="col-3">@note.Description</td>
+                        @if (note.Pinned)
+                        {
+                            <td class="col-3"><i class='bi bi-pin-fill me-2'></i>@note.Description</td>
+                        } else
+                        {
+                            <td class="col-3">@note.Description</td>
+                        }
                         <td class="col-9 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(note.NoteText, 100)</td>
                     </tr>
                 }

Views/Vehicle/_OdometerRecordModal.cshtml

@@ -21,7 +21,7 @@
                     <input type="number" id="odometerRecordMileage" class="form-control" placeholder="Odometer reading" value="@(isNew ? "" : Model.Mileage)">
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="odometerRecordNotes">Notes(optional)</label>
+                    <label for="odometerRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="odometerRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
@@ -29,12 +29,14 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="odometerRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="odometerRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
                     {
                         <label for="odometerRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="odometerRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>

Views/Vehicle/_OdometerRecords.cshtml

@@ -21,6 +21,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('OdometerRecord')">Import via CSV</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('OdometerRecord')">Export to CSV</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                     </ul>
                 </div>
             }
@@ -52,7 +54,7 @@
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditOdometerRecordModal(@odometerRecord.Id)">
                         <td class="col-2 col-xl-1">@odometerRecord.Date.ToShortDateString()</td>
                         <td class="col-3">@odometerRecord.Mileage</td>
-                        <td class="col-7 col-xl-8 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes)</td>
+                        <td class="col-7 col-xl-8 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75)</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_PlanRecordItem.cshtml

@@ -1,5 +1,5 @@
 @model PlanRecord
-<div class="taskCard @(Model.Progress == PlanProgress.Done ? "nodrag" : "") text-dark user-select-none mb-2" draggable="@(Model.Progress == PlanProgress.Done ? "false" : "true")" ondragstart="dragStart(event, @Model.Id)" onclick="@(Model.Progress == PlanProgress.Done ? $"deletePlanRecord({Model.Id})" : $"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})" : $"showEditPlanRecordModal({Model.Id})")">
     <div class="card-body">
         <div class="row">
             <div class="col-12 col-lg-8 text-truncate">

Views/Vehicle/_PlanRecordModal.cshtml

@@ -16,6 +16,10 @@
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="Describe the Plan" value="@Model.Description">
                     <label for="planRecordCost">Cost</label>
                     <input type="text" id="planRecordCost" class="form-control" placeholder="Cost of the Plan" value="@Model.Cost">
+                    @if (isNew)
+                    {
+                        @await Html.PartialAsync("_SupplyStore", "PlanRecord")
+                    }
                     <label for="planRecordType">Type</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>Service</!option>
@@ -41,7 +45,7 @@
                     }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="planRecordNotes">Notes(optional)</label>
+                    <label for="planRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="planRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
@@ -49,12 +53,14 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="planRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="planRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
                     {
                         <label for="planRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="planRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>
@@ -78,6 +84,7 @@
 </div>
 <script>
     var uploadedFiles = [];
+    var selectedSupplies = [];
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)

Views/Vehicle/_ReminderRecordModal.cshtml

@@ -39,7 +39,7 @@
                     </div>
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="reminderNotes">Notes(optional)</label>
+                    <label for="reminderNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="reminderNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     <div class="form-check form-switch">
                         <input class="form-check-input" type="checkbox" onChange="enableRecurring()" role="switch" id="reminderIsRecurring" checked="@Model.IsRecurring">
@@ -47,19 +47,31 @@
                     </div>
                     <label for="reminderRecurringMileage">Odometer</label>
                     <select class="form-select" id="reminderRecurringMileage" @(Model.IsRecurring ? "" : "disabled")>
-                        <!option value="FiveHundredMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiveHundredMiles || isNew ? "selected" : "")>500 mi. / Km</!option>
+                        <!option value="FiftyMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiftyMiles ? "selected" : "")>50 mi. / Km</!option>
+                        <!option value="OneHundredMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredMiles ? "selected" : "")>100 mi. / Km</!option>
+                        <!option value="FiveHundredMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiveHundredMiles ? "selected" : "")>500 mi. / Km</!option>
                         <!option value="OneThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneThousandMiles ? "selected" : "")>1000 mi. / Km</!option>
                         <!option value="ThreeThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.ThreeThousandMiles ? "selected" : "")>3000 mi. / Km</!option>
+                        <!option value="FourThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FourThousandMiles ? "selected" : "")>4000 mi. / Km</!option>
                         <!option value="FiveThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiveThousandMiles || isNew ? "selected" : "")>5000 mi. / Km</!option>
                         <!option value="SevenThousandFiveHundredMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.SevenThousandFiveHundredMiles ? "selected" : "")>7500 mi. / Km</!option>
                         <!option value="TenThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.TenThousandMiles ? "selected" : "")>10000 mi. / Km</!option>
+                        <!option value="FifteenThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FifteenThousandMiles ? "selected" : "")>15000 mi. / Km</!option>
+                        <!option value="TwentyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.TwentyThousandMiles ? "selected" : "")>20000 mi. / Km</!option>
+                        <!option value="ThirtyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.ThirtyThousandMiles ? "selected" : "")>30000 mi. / Km</!option>
+                        <!option value="FortyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FortyThousandMiles ? "selected" : "")>40000 mi. / Km</!option>
                         <!option value="FiftyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiftyThousandMiles ? "selected" : "")>50000 mi. / Km</!option>
+                        <!option value="SixtyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.SixtyThousandMiles ? "selected" : "")>60000 mi. / Km</!option>
+                        <!option value="OneHundredThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredThousandMiles ? "selected" : "")>100000 mi. / Km</!option>
+                        <!option value="OneHundredFiftyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredFiftyThousandMiles ? "selected" : "")>150000 mi. / Km</!option>
                     </select>
                     <label for="reminderRecurringMonth">Month</label>
                     <select class="form-select" id="reminderRecurringMonth" @(Model.IsRecurring ? "" : "disabled")>
                         <!option value="ThreeMonths" @(Model.ReminderMonthInterval == ReminderMonthInterval.ThreeMonths || isNew ? "selected" : "")>3 Months</!option>
                         <!option value="SixMonths" @(Model.ReminderMonthInterval == ReminderMonthInterval.SixMonths ? "selected" : "")>6 Months</!option>
                         <!option value="OneYear" @(Model.ReminderMonthInterval == ReminderMonthInterval.OneYear ? "selected" : "")>1 Year</!option>
+                        <!option value="TwoYears" @(Model.ReminderMonthInterval == ReminderMonthInterval.TwoYears ? "selected" : "")>2 Years</!option>
+                        <!option value="ThreeYears" @(Model.ReminderMonthInterval == ReminderMonthInterval.ThreeYears ? "selected" : "")>3 Years</!option>
                         <!option value="FiveYears" @(Model.ReminderMonthInterval == ReminderMonthInterval.FiveYears ? "selected" : "")>5 Years</!option>
                     </select>
                 </div>

Views/Vehicle/_ReminderRecords.cshtml

@@ -1,4 +1,7 @@
 @model List<ReminderRecordViewModel>
+@{
+    var hasRefresh = Model.Where(x => (x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue) && x.IsRecurring).Any();
+}
 <div class="row">
     <div class="d-flex justify-content-between">
         <div class="d-flex align-items-center flex-wrap">
@@ -25,8 +28,12 @@
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Urgency</th>
                     <th scope="col" class="col-2">Metric</th>
-                    <th scope="col" class="col-5">Description</th>
+                    <th scope="col" class="@(hasRefresh ? "col-4" : "col-5")">Description</th>
                     <th scope="col" class="col-3">Notes</th>
+                    @if (hasRefresh)
+                    {
+                        <th scope="col" class="col-1">Done</th>
+                    }
                     <th scope="col" class="col-1">Delete</th>
                 </tr>
             </thead>
@@ -62,8 +69,17 @@
                         {
                             <td class="col-2">@reminderRecord.Metric</td>
                         }
-                        <td class="col-5">@reminderRecord.Description</td>
+                        <td class="@(hasRefresh ? "col-4" : "col-5")">@reminderRecord.Description</td>
                         <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
+                        @if (hasRefresh)
+                        {
+                            <td class="col-1 text-truncate">
+                                @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-1 text-truncate">
                             <button type="button" class="btn btn-danger" onclick="deleteReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-trash"></i></button>
                         </td>

Views/Vehicle/_Report.cshtml

@@ -1,90 +1,93 @@
 @model ReportViewModel
 <div class="container reportTabContainer">
-<div class="row hideOnPrint">
-    <div class="col-md-3 col-12 mt-2">
-        <div class="row">
-            <div class="col-12">
-                <select class="form-select" id="yearOption" onchange="yearUpdated()">
-                    <option value="0">All Time</option>
-                    @foreach (int year in Model.Years)
-                    {
-                        <option value="@year">@year</option>
-                    }
-                </select>
+    <div class="row hideOnPrint">
+        <div class="col-md-3 col-12 mt-2">
+            <div class="row">
+                <div class="col-12">
+                    <select class="form-select" id="yearOption" onchange="yearUpdated()">
+                        <option value="0">All Time</option>
+                        @foreach (int year in Model.Years)
+                        {
+                            <option value="@year">@year</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row">
+                <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="costMakeUpReportContent">
+                    @await Html.PartialAsync("_CostMakeUpReport", Model.CostMakeUpForVehicle)
+                </div>
             </div>
         </div>
-        <div class="row">
-            <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="costMakeUpReportContent">
-                @await Html.PartialAsync("_CostMakeUpReport", Model.CostMakeUpForVehicle)
-            </div>
-        </div>
-    </div>
-    <div class="col-md-6 col-12 mt-2">
-        <div class="row">
-            <div class="col-md-1 d-sm-none d-md-block"></div>
-            <div class="col-12 col-md-10 reportsCheckBoxContainer">
-                <div class="form-check form-check-inline">
-                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="serviceExpenseCheck" value="1" checked>
-                    <label class="form-check-label" for="serviceExpenseCheck">Service</label>
-                </div>
-                <div class="form-check form-check-inline">
-                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="repairExpenseCheck" value="2" checked>
-                    <label class="form-check-label" for="repairExpenseCheck">Repairs</label>
-                </div>
-                <div class="form-check form-check-inline">
-                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="upgradeExpenseCheck" value="3" checked>
-                    <label class="form-check-label" for="upgradeExpenseCheck">Upgrades</label>
-                </div>
-                <div class="form-check form-check-inline">
-                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="gasExpenseCheck" value="4" checked>
-                    <label class="form-check-label" for="gasExpenseCheck">Gas</label>
-                </div>
-                <div class="form-check form-check-inline">
-                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="taxExpenseCheck" value="5" checked>
-                    <label class="form-check-label" for="taxExpenseCheck">Tax</label>
-                </div>
-            </div>
+        <div class="col-md-6 col-12 mt-2">
+            <div class="row">
                 <div class="col-md-1 d-sm-none d-md-block"></div>
+                <div class="col-12 col-md-10 reportsCheckBoxContainer">
+                    <div class="form-check form-check-inline">
+                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="serviceExpenseCheck" value="1" checked>
+                        <label class="form-check-label" for="serviceExpenseCheck">Service</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="repairExpenseCheck" value="2" checked>
+                        <label class="form-check-label" for="repairExpenseCheck">Repairs</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="upgradeExpenseCheck" value="3" checked>
+                        <label class="form-check-label" for="upgradeExpenseCheck">Upgrades</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="gasExpenseCheck" value="4" checked>
+                        <label class="form-check-label" for="gasExpenseCheck">Fuel</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="taxExpenseCheck" value="5" checked>
+                        <label class="form-check-label" for="taxExpenseCheck">Taxes</label>
+                    </div>
+                </div>
+                <div class="col-md-1 d-sm-none d-md-block"></div>
+            </div>
+            <div class="row">
+                <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="gasCostByMonthReportContent">
+                    @await Html.PartialAsync("_GasCostByMonthReport", Model.CostForVehicleByMonth)
+                </div>
+            </div>
         </div>
-        <div class="row">
-            <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="gasCostByMonthReportContent">
-                @await Html.PartialAsync("_GasCostByMonthReport", Model.CostForVehicleByMonth)
+        <div class="col-md-3 col-12 mt-2">
+            <div class="row">
+                <div class="col-12">
+                    <select class="form-select" onchange="updateReminderPie()" id="reminderOption">
+                        <option value="0">As of Today</option>
+                        <option value="30">+30 Days</option>
+                        <option value="60">+60 Days</option>
+                        <option value="90">+90 Days</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row">
+                <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="reminderMakeUpReportContent">
+                    @await Html.PartialAsync("_ReminderMakeUpReport", Model.ReminderMakeUpForVehicle)
+                </div>
             </div>
         </div>
     </div>
-    <div class="col-md-3 col-12 mt-2">
-        <div class="row">
-            <div class="col-12">
-                <select class="form-select" onchange="updateReminderPie()" id="reminderOption">
-                    <option value="0">As of Today</option>
-                    <option value="30">+30 Days</option>
-                    <option value="60">+60 Days</option>
-                    <option value="90">+90 Days</option>
-                </select>
+    <hr />
+    <div class="row hideOnPrint">
+        <div class="col-md-3 col-12 chartContainer" id="collaboratorContent">
+            @await Html.PartialAsync("_Collaborators", Model.Collaborators)
+        </div>
+        <div class="col-md-6 col-12 chartContainer">
+            <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="monthFuelMileageReportContent">
+                @await Html.PartialAsync("_MPGByMonthReport", Model.FuelMileageForVehicleByMonth)
             </div>
         </div>
-        <div class="row">
-            <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="reminderMakeUpReportContent">
-                @await Html.PartialAsync("_ReminderMakeUpReport", Model.ReminderMakeUpForVehicle)
+        <div class="col-md-3 col-12 chartContainer">
+            <div class="d-grid">
+                <button onclick="generateVehicleHistoryReport()" class="btn btn-secondary btn-md mt-1 mb-1">Vehicle Maintenance Report<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
+            </div>
+            <div class="d-grid">
+                <button onclick="exportAttachments()" class="btn btn-secondary btn-md mt-1 mb-1">Export Attachments<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
             </div>
         </div>
     </div>
 </div>
-<hr />
-<div class="row hideOnPrint">
-    <div class="col-md-3 col-12 chartContainer" id="collaboratorContent">
-        @await Html.PartialAsync("_Collaborators", Model.Collaborators)
-    </div>
-    <div class="col-md-6 col-12 chartContainer">
-        <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="monthFuelMileageReportContent">
-            @await Html.PartialAsync("_MPGByMonthReport", Model.FuelMileageForVehicleByMonth)
-        </div>
-    </div>
-    <div class="col-md-3 col-12 chartContainer">
-        <div class="d-flex justify-content-center">
-            <button onclick="generateVehicleHistoryReport()" class="btn btn-secondary btn-md mt-1 mb-1">Vehicle Maintenance Report<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
-        </div>
-    </div>
-</div>
-</div>
 <div id="vehicleHistoryReport" class="showOnPrint"></div>

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -23,9 +23,13 @@
                     <input type="text" id="serviceRecordDescription" class="form-control" placeholder="Description of item(s) serviced(i.e. Oil Change)" value="@Model.Description">
                     <label for="serviceRecordCost">Cost</label>
                     <input type="text" id="serviceRecordCost" class="form-control" placeholder="Cost of the service" value="@(isNew ? "" : Model.Cost)">
+                    @if (isNew)
+                    {
+                        @await Html.PartialAsync("_SupplyStore", "ServiceRecord")
+                    }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="serviceRecordNotes">Notes(optional)</label>
+                    <label for="serviceRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="serviceRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
@@ -33,6 +37,7 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="serviceRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="serviceRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
@@ -48,6 +53,7 @@
                         }
                         <label for="serviceRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="serviceRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>
@@ -57,7 +63,17 @@
 <div class="modal-footer">
     @if (!isNew)
     {
-        <button type="button" class="btn btn-danger" onclick="deleteServiceRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+        <div class="btn-group" style="margin-right:auto;">
+            <button type="button" class="btn btn-md mt-1 mb-1 btn-danger" onclick="deleteServiceRecord(@Model.Id)" >Delete</button>
+            <button type="button" class="btn btn-md btn-danger 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><h6 class="dropdown-header">Move To</h6></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'ServiceRecord', 'RepairRecord')">Repairs</a></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'ServiceRecord', 'UpgradeRecord')">Upgrades</a></li>
+            </ul>
+        </div>
     }
     <button type="button" class="btn btn-secondary" onclick="hideAddServiceRecordModal()">Cancel</button>
     @if (isNew)
@@ -71,6 +87,7 @@
 </div>
 <script>
     var uploadedFiles = [];
+    var selectedSupplies = [];
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)

Views/Vehicle/_ServiceRecords.cshtml

@@ -22,6 +22,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('ServiceRecord')">Import via CSV</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('ServiceRecord')">Export to CSV</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                     </ul>
                 </div>
             }
@@ -45,7 +47,7 @@
                     <th scope="col" class="col-2 col-xl-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
                     <th scope="col" class="col-3 col-xl-4">Description</th>
-                    <th scope="col" class="col-2">Cost</th>
+                    <th scope="col" class="col-2" onclick="toggleSort('servicerecord-tab-pane', this)" style="cursor:pointer;">Cost</th>
                     <th scope="col" class="col-3">Notes</th>
                 </tr>
             </thead>

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -35,7 +35,7 @@
                     </div>
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="supplyRecordNotes">Notes(optional)</label>
+                    <label for="supplyRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="supplyRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
@@ -43,12 +43,14 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="supplyRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="supplyRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
                     {
                         <label for="supplyRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="supplyRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>

Views/Vehicle/_SupplyRecords.cshtml

@@ -22,6 +22,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('SupplyRecord')">Import via CSV</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('SupplyRecord')">Export to CSV</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                     </ul>
                 </div>
             }
@@ -46,8 +48,8 @@
                     <th scope="col" class="col-2">Part #</th>
                     <th scope="col" class="col-2">Supplier</th>
                     <th scope="col" class="col-2 col-xl-3">Description</th>
-                    <th scope="col" class="col-1">Quantity</th>
-                    <th scope="col" class="col-1">Cost</th>
+                    <th scope="col" class="col-1" onclick="toggleSort('supply-tab-pane', this)" style="cursor:pointer;">Quantity</th>
+                    <th scope="col" class="col-1" onclick="toggleSort('supply-tab-pane', this)" style="cursor:pointer;">Cost</th>
                     <th scope="col" class="col-2">Notes</th>
                 </tr>
             </thead>

Views/Vehicle/_SupplyStore.cshtml

@@ -0,0 +1,91 @@
+@model string
+<div class="row">
+    <div class="col-12">
+        <a onclick="showSuppliesModal()" class="btn btn-link">Choose Supplies</a>
+    </div>
+</div>
+<script>
+    resetSuppliesModal();
+    function GetCaller() {
+        return { tab: '@Model' };
+    }
+    function resetSuppliesModal() {
+        $("#inputSuppliesModalContent").html("");
+    }
+    function selectSupplies() {
+        var selectedSupplyResult = getSuppliesAndQuantity();
+        var caller = GetCaller().tab;
+        switch (caller) {
+            case "ServiceRecord":
+                $('#serviceRecordCost').val(selectedSupplyResult.totalSum);
+                break;
+            case "RepairRecord":
+                $('#collisionRecordCost').val(selectedSupplyResult.totalSum);
+                break;
+            case "UpgradeRecord":
+                $('#upgradeRecordCost').val(selectedSupplyResult.totalSum);
+                break;
+            case "PlanRecord":
+                $('#planRecordCost').val(selectedSupplyResult.totalSum);
+                break;
+        }
+        selectedSupplies = getSuppliesAndQuantity().selectedSupplies;
+        hideSuppliesModal();
+    }
+    function hideParentModal(){
+        var caller = GetCaller().tab;
+        switch (caller) {
+            case "ServiceRecord":
+                $('#serviceRecordModal').modal('hide');
+                break;
+            case "RepairRecord":
+                $('#collisionRecordModal').modal('hide');
+                break;
+            case "UpgradeRecord":
+                $('#upgradeRecordModal').modal('hide');
+                break;
+            case "PlanRecord":
+                $('#planRecordModal').modal('hide');
+                break;
+        }
+    }
+    function showParentModal() {
+        var caller = GetCaller().tab;
+        switch (caller) {
+            case "ServiceRecord":
+                $('#serviceRecordModal').modal('show');
+                break;
+            case "RepairRecord":
+                $('#collisionRecordModal').modal('show');
+                break;
+            case "UpgradeRecord":
+                $('#upgradeRecordModal').modal('show');
+                break;
+            case "PlanRecord":
+                $('#planRecordModal').modal('show');
+                break;
+        }
+    }
+    function showSuppliesModal() {
+        if ($("#inputSuppliesModalContent").html() == "") {
+            getSupplies();
+        } else {
+            hideParentModal();
+            $('#inputSuppliesModal').modal('show');
+        }
+    }
+    function getSupplies() {
+        var vehicleId = GetVehicleId().vehicleId;
+        $.get(`/Vehicle/GetSupplyRecordsForRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
+            if (data) {
+                hideParentModal();
+                $("#inputSuppliesModalContent").html(data);
+                $('#inputSuppliesModal').modal('show');
+            }
+        })
+    }
+    function hideSuppliesModal() {
+        $('#inputSuppliesModal').modal('hide');
+        showParentModal();
+    }
+</script>

Views/Vehicle/_SupplyUsage.cshtml

@@ -0,0 +1,127 @@
+@model List<SupplyRecord>
+<div class="modal-header">
+    <h5 class="modal-title">Select Supplies</h5>
+    <button type="button" class="btn-close" onclick="hideSuppliesModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    @if (Model.Any())
+    {
+        <div class="row">
+            <div class="col-12" style="max-height:50vh; overflow-y:auto;">
+                <div class="alert alert-warning" role="alert">
+                    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.
+                </div>
+                <table class="table table-hover">
+                    <thead class="sticky-top">
+                        <tr class="d-flex">
+                            <th scope="col" class="col-1"></th>
+                            <th scope="col" class="col-2">Quantity.</th>
+                            <th scope="col" class="col-2">In Stock</th>
+                            <th scope="col" class="col-5">Description</th>
+                            <th scope="col" class="col-2">Unit Cost</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (SupplyRecord supplyRecord in Model)
+                        {
+                            <tr class="d-flex" id="supplyRows">
+                                <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id"></td>
+                                <td class="col-2"><input type="text" disabled onchange="recalculateTotal()" class="form-control"></td>
+                                <td class="col-2 supplyquantity">@supplyRecord.Quantity</td>
+                                <td class="col-5">@supplyRecord.Description</td>
+                                <td class="col-2 supplyprice">@((supplyRecord.Quantity > 0 ? supplyRecord.Cost / supplyRecord.Quantity : 0).ToString("F"))</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    }
+    else
+    {
+        <div class="row">
+            <div class="col-12">
+                <div class="text-center">
+                    <h4>No supplies with quantities greater than 0 is found.</h4>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+<div class="modal-footer">
+    <span id="supplySumLabel" style="margin-right:auto;">Total: 0.00</span>
+    <button type="button" class="btn btn-secondary" onclick="hideSuppliesModal()">Cancel</button>
+    <button type="button" class="btn btn-primary" disabled id="selectSuppliesButton" onclick="selectSupplies()">Select</button>
+</div>
+<script>
+    function recalculateTotal() {
+        setDebounce(getSuppliesAndQuantity);
+    }
+    function toggleQuantityFieldDisabled(e) {
+        var textField = getTextFieldFromCheckBox(e);
+        var isChecked = $(e).is(":checked");
+        textField.attr('disabled', !isChecked);
+        if (!isChecked) {
+            textField.removeClass("is-invalid");
+        }
+        recalculateTotal();
+    }
+    function getTextFieldFromCheckBox(elem) {
+        var textField = $(elem.parentElement.parentElement).find('.col-2 > input[type=text]')[0];
+        return $(textField);
+    }
+    function getInStockFieldFromCheckBox(elem) {
+        var textField = $(elem.parentElement.parentElement).find('.col-2.supplyquantity')[0];
+        return $(textField);
+    }
+    function getPriceFieldFromCheckBox(elem) {
+        var textField = $(elem.parentElement.parentElement).find('.col-2.supplyprice')[0];
+        return $(textField);
+    }
+    function getSuppliesAndQuantity() {
+        var totalSum = 0;
+        var hasError = false;
+        var selectedSupplies = $("#supplyRows :checked").map(function () {
+            var textField = getTextFieldFromCheckBox(this);
+            var inStock = getInStockFieldFromCheckBox(this);
+            var priceField = getPriceFieldFromCheckBox(this);
+            var requestedQuantity = globalParseFloat(textField.val());
+            var inStockQuantity = globalParseFloat(inStock.text());
+            var unitPrice = globalParseFloat(priceField.text());
+            //validation
+            if (isNaN(requestedQuantity) || requestedQuantity > inStockQuantity) {
+                textField.addClass("is-invalid");
+                hasError = true;
+            } else {
+                textField.removeClass("is-invalid");
+            }
+            //calculate sum.
+            var sum = requestedQuantity * unitPrice;
+            totalSum += sum;
+            return {
+                supplyId: this.value,
+                quantity: textField.val()
+            };
+        });
+        if (isNaN(totalSum) || hasError) {
+            $("#supplySumLabel").text(`Total: 0.00`);
+        } else {
+            totalSum = totalSum.toFixed(2);
+            var parsedFloat = globalFloatToString(totalSum);
+            $("#supplySumLabel").text(`Total: ${parsedFloat}`);
+        }
+        $("#selectSuppliesButton").attr('disabled', (hasError || totalSum == 0));
+        if (!hasError) {
+            return {
+                totalSum: totalSum,
+                selectedSupplies: selectedSupplies.toArray()
+            };
+        } else {
+            return {
+                totalSum: 0,
+                selectedSupplies: []
+            }
+        }
+    }
+</script>

Views/Vehicle/_TaxRecordModal.cshtml

@@ -23,14 +23,29 @@
                     <input type="text" id="taxRecordCost" class="form-control" placeholder="Cost of tax paid" value="@(isNew? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="taxRecordNotes">Notes(optional)</label>
+                    <label for="taxRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="taxRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" onChange="enableTaxRecurring()" role="switch" id="taxIsRecurring" checked="@Model.IsRecurring">
+                        <label class="form-check-label" for="taxIsRecurring">Is Recurring</label>
+                    </div>
+                    <label for="taxRecurringMonth">Month</label>
+                    <select class="form-select" id="taxRecurringMonth" @(Model.IsRecurring ? "" : "disabled")>
+                        <!option value="OneMonth" @(Model.RecurringInterval == ReminderMonthInterval.OneMonth ? "selected" : "")>1 Month</!option>
+                        <!option value="ThreeMonths" @(Model.RecurringInterval == ReminderMonthInterval.ThreeMonths || isNew ? "selected" : "")>3 Months</!option>
+                        <!option value="SixMonths" @(Model.RecurringInterval == ReminderMonthInterval.SixMonths ? "selected" : "")>6 Months</!option>
+                        <!option value="OneYear" @(Model.RecurringInterval == ReminderMonthInterval.OneYear ? "selected" : "")>1 Year</!option>
+                        <!option value="TwoYears" @(Model.RecurringInterval == ReminderMonthInterval.TwoYears ? "selected" : "")>2 Years</!option>
+                        <!option value="ThreeYears" @(Model.RecurringInterval == ReminderMonthInterval.ThreeYears ? "selected" : "")>3 Years</!option>
+                        <!option value="FiveYears" @(Model.RecurringInterval == ReminderMonthInterval.FiveYears ? "selected" : "")>5 Years</!option>
+                    </select>
                     @if (Model.Files.Any())
                     {
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="taxRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="taxRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
@@ -46,6 +61,7 @@
                         }
                         <label for="taxRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="taxRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>

Views/Vehicle/_TaxRecords.cshtml

@@ -22,6 +22,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('TaxRecord')">Import via CSV</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('TaxRecord')">Export to CSV</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                     </ul>
                 </div>
             }
@@ -44,7 +46,7 @@
                 <tr class="d-flex">
                     <th scope="col" class="col-3 col-xl-1">Date</th>
                     <th scope="col" class="col-4 col-xl-6">Description</th>
-                    <th scope="col" class="col-2">Cost</th>
+                    <th scope="col" class="col-2" onclick="toggleSort('tax-tab-pane', this)" style="cursor:pointer;">Cost</th>
                     <th scope="col" class="col-3">Notes</th>
                 </tr>
             </thead>

Views/Vehicle/_UpgradeRecordModal.cshtml

@@ -23,9 +23,13 @@
                     <input type="text" id="upgradeRecordDescription" class="form-control" placeholder="Description of item(s) upgraded/modded" value="@Model.Description">
                     <label for="upgradeRecordCost">Cost</label>
                     <input type="text" id="upgradeRecordCost" class="form-control" placeholder="Cost of the upgrade/mods" value="@(isNew ? "" : Model.Cost)">
+                    @if (isNew)
+                    {
+                        @await Html.PartialAsync("_SupplyStore", "UpgradeRecord")
+                    }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="upgradeRecordNotes">Notes(optional)</label>
+                    <label for="upgradeRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="upgradeRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
@@ -33,6 +37,7 @@
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="upgradeRecordFiles">Upload more documents</label>
                             <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="upgradeRecordFiles">
+                            <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                         </div>
                     }
                     else
@@ -48,6 +53,7 @@
                         }
                         <label for="upgradeRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="upgradeRecordFiles">
+                        <br /><small class="text-body-secondary">Max File Size: 28.6MB</small>
                     }
                 </div>
             </div>
@@ -57,7 +63,17 @@
 <div class="modal-footer">
     @if (!isNew)
     {
-        <button type="button" class="btn btn-danger" onclick="deleteUpgradeRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+        <div class="btn-group" style="margin-right:auto;">
+            <button type="button" class="btn btn-md mt-1 mb-1 btn-danger" onclick="deleteUpgradeRecord(@Model.Id)">Delete</button>
+            <button type="button" class="btn btn-md btn-danger 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><h6 class="dropdown-header">Move To</h6></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'UpgradeRecord', 'ServiceRecord')">Service Records</a></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'UpgradeRecord', 'RepairRecord')">Repairs</a></li>
+            </ul>
+        </div>
     }
     <button type="button" class="btn btn-secondary" onclick="hideAddUpgradeRecordModal()">Cancel</button>
     @if (isNew)
@@ -71,6 +87,7 @@
 </div>
 <script>
     var uploadedFiles = [];
+    var selectedSupplies = [];
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)

Views/Vehicle/_UpgradeRecords.cshtml

@@ -22,6 +22,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('UpgradeRecord')">Import via CSV</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('UpgradeRecord')">Export to CSV</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="printTab()">Print</a></li>
                     </ul>
                 </div>
             }
@@ -45,7 +47,7 @@
                     <th scope="col" class="col-2 col-xl-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
                     <th scope="col" class="col-3 col-xl-4">Description</th>
-                    <th scope="col" class="col-2">Cost</th>
+                    <th scope="col" class="col-2" onclick="toggleSort('upgrade-tab-pane', this)" style="cursor:pointer;">Cost</th>
                     <th scope="col" class="col-3">Notes</th>
                 </tr>
             </thead>

Views/Vehicle/_VehicleHistory.cshtml

@@ -5,22 +5,24 @@
     var useMPG = config.GetUserConfig(User).UseMPG;
     var useUKMPG = config.GetUserConfig(User).UseUKMPG;
     var useKwh = Model.VehicleData.IsElectric;
+    var useHours = Model.VehicleData.UseHours;
     string fuelEconomyUnit;
     if (useKwh)
     {
-        fuelEconomyUnit = useMPG ? "mi./kWh" : "kWh/100km";
+        var distanceUnit = useHours ? "h" : (useMPG ? "mi." : "km");
+        fuelEconomyUnit = useMPG ? $"{distanceUnit}/kWh" : $"kWh/100{distanceUnit}";
     }
     else if (useMPG && useUKMPG)
     {
-        fuelEconomyUnit = "mpg";
+        fuelEconomyUnit = useHours ? "h/g" : "mpg";
     }
     else if (useUKMPG)
     {
-        fuelEconomyUnit = "l/100mi.";
+        fuelEconomyUnit = useHours ? "l/100h" : "l/100mi.";
     }
     else
     {
-        fuelEconomyUnit = useMPG ? "mpg" : "l/100km";
+        fuelEconomyUnit = useHours ? (useMPG ? "h/g" : "l/100h") : (useMPG ? "mpg" : "l/100km");
     }
 }
 @model VehicleHistoryViewModel
@@ -56,7 +58,7 @@
         <div class="col-6">
             <ul class="list-group">
                 <li class="list-group-item">Last Reported Odometer Reading: @Model.Odometer</li>
-                <li class="list-group-item">Average Fuel Economy: @($"{Model.MPG.ToString("F")} {fuelEconomyUnit}")</li>
+                <li class="list-group-item">Average Fuel Economy: @($"{Model.MPG} {fuelEconomyUnit}")</li>
                 <li class="list-group-item">Total Spent(excl. fuel): @Model.TotalCost.ToString("C")</li>
                 <li class="list-group-item">Total Spent on Fuel: @Model.TotalGasCost.ToString("C")</li>
             </ul>
@@ -68,8 +70,8 @@
             <table class="table table-hover">
                 <thead>
                     <tr class="d-flex">
-                        <th scope="col" class="col-2">Type</th>
-                        <th scope="col" class="col-1">Date</th>
+                        <th scope="col" class="col-2 servicehistorytype">Type</th>
+                        <th scope="col" class="col-1 servicehistorydate">Date</th>
                         <th scope="col" class="col-1">Odometer</th>
                         <th scope="col" class="col-3">Description</th>
                         <th scope="col" class="col-1">Cost</th>
@@ -80,7 +82,7 @@
                     @foreach (GenericReportModel reportData in Model.VehicleHistory)
                     {
                         <tr class="d-flex">
-                            <td class="col-2">
+                            <td class="col-2 servicehistorytype">
                                 @if(reportData.DataType == ImportMode.ServiceRecord)
                                 {
                                     <span><i class="bi bi-card-checklist me-2"></i>Service</span>
@@ -95,7 +97,7 @@
                                     <span><i class="bi bi-currency-dollar me-2"></i>Tax</span>
                                 }
                             </td>
-                            <td class="col-1">@reportData.Date.ToShortDateString()</td>
+                            <td class="col-1 servicehistorydate">@reportData.Date.ToShortDateString()</td>
                             <td class="col-1">@(reportData.Odometer == default ? "---" : reportData.Odometer.ToString("N0"))</td>
                             <td class="col-3">@reportData.Description</td>
                             <td class="col-1">@((hideZero && reportData.Cost == default) ? "---" : reportData.Cost.ToString("C"))</td>

Views/Vehicle/_VehicleModal.cshtml

@@ -33,6 +33,10 @@
                 <input class="form-check-input" type="checkbox" role="switch" id="inputIsElectric" checked="@Model.IsElectric">
                 <label class="form-check-label" for="inputIsElectric">Electric Vehicle</label>
             </div>
+            <div class="form-check form-switch">
+                <input class="form-check-input" type="checkbox" role="switch" id="inputUseHours" checked="@Model.UseHours">
+                <label class="form-check-label" for="inputUseHours">Use Engine Hours</label>
+            </div>
             @if (!string.IsNullOrWhiteSpace(Model.ImageLocation))
             {
                 <label for="inputImage">Replace picture(optional)</label>

appsettings.json

@@ -12,10 +12,13 @@
   "UseDescending": false,
   "EnableAuth": false,
   "HideZero": false,
+  "EnableAutoReminderRefresh": false,
+  "EnableAutoOdometerInsert": false,
   "UseUKMPG": false,
   "UseThreeDecimalGasCost": true,
+  "UseMarkDownOnSavedNotes":  false,
   "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],
-  "DefaultTab":  8,
+  "DefaultTab": 8,
   "UserNameHash": "",
   "UserPasswordHash": ""
 }

docs/documentation/Collaboration.md

@@ -0,0 +1,21 @@
+# Sharing your Vehicles and Collaborating with Other Users
+
+LubeLogger allows you to collaborate on vehicles so that more than one user can add or edit records on a vehicle.
+
+To share a vehicle, simply navigate into the Vehicle's Dashboard, and look to the bottom left
+
+![image](https://github.com/hargata/lubelog/assets/155338622/76eda35f-5547-47d9-91cb-3fbf30d2a3d9)
+
+Click on the little blue button with a User Add icon and you will be prompted to enter the user's username
+
+![image](https://github.com/hargata/lubelog/assets/155338622/6bbcc309-a790-48e0-91fa-24c57df20531)
+
+**Note:** The username is case sensitive and the user must exist in the system.
+
+Once you have added the user, their username will then show up in the list of Collaborators
+
+![image](https://github.com/hargata/lubelog/assets/155338622/edac8c3b-eb3e-411d-ab45-e54cb66206f3)
+
+Now the user can view and edit the vehicle as well:
+
+![image](https://github.com/hargata/lubelog/assets/155338622/85b0aacf-ae5c-4361-8d1c-32f9ec637a5b)

docs/documentation/Configuring.md

@@ -0,0 +1,51 @@
+# Configuring LubeLogger
+In order to provide the best possible user experience, we have provided ample amount of flexibility when it comes to user settings.
+Upon initial launch, you are using the Root User by default without any authentication, so you will have access to all of the settings.
+
+![image](https://github.com/hargata/lubelog/assets/155338622/cf73ff68-e79b-468d-84fb-375e481cbadd)
+
+Most of the settings are relatively straightforward and self-explanatory.
+
+**Note:** If you are a user in the UK and you wish be able to input Fuel Purchases in Liters but display Fuel Mileage as Miles Per UK Gallons, you will need to enable "Use Imperial Calculation" and "Use UK MPG Calculation"
+
+**Note:** When making changes to Settings as a root user, your settings will be saved and served up as the default server settings for any new users that sign up.
+
+## Enable Authentication
+It is highly recommended that you secure your LubeLogger instance by enabling authentication.
+To do so, simply check "Enable Authentication" and you will be prompted to enter a Username and Password
+
+![image](https://github.com/hargata/lubelog/assets/155338622/4d8b1855-e437-4ade-999b-3dd6ea19e55f)
+
+The credentials that you set up here are the credentials for the Root User, aka the Super Admin, and shouldn't be shared with anyone else.
+
+Once you have entered the credentials, you will then be redirected to a Login page
+
+![image](https://github.com/hargata/lubelog/assets/155338622/26181116-5a03-48cf-972d-89a4b1050cce)
+
+Simply enter the credentials you have just set up and you will be logged right in
+
+![image](https://github.com/hargata/lubelog/assets/155338622/20d9a3b9-80de-4a32-8cb6-1100dd237dbd)
+
+## Setting Up Multiple Users
+To set up multiple users, all you have to do is click on the dropdown that has your username on it and select "Admin Panel"
+
+![image](https://github.com/hargata/lubelog/assets/155338622/75f32408-b9f3-4e2c-bec6-ea1c196c3438)
+
+If you have SMTP configured correctly, the "Auto Notify(via Email) switch will be enabled and checked, otherwise it will be disabled/grayed out.
+Without SMTP Configured:
+
+![image](https://github.com/hargata/lubelog/assets/155338622/9d75ab55-afb7-4d3e-b830-3191de23695c)
+
+With SMTP Configured:
+
+![image](https://github.com/hargata/lubelog/assets/155338622/d9995c30-dd47-44d1-a73d-39f0f129450b)
+
+To generate a new user token, simply click on the "Generate User Token" button and you will be prompted with the user's email address
+
+![image](https://github.com/hargata/lubelog/assets/155338622/f870d5cd-4d4b-480c-94ea-b1161757793f)
+
+If you have SMTP Configured, the user will then receive an Email that looks similar to this:
+![image](https://github.com/hargata/lubelog/assets/155338622/0d5c1adf-43d1-45a5-ad59-91fb3b1476af)
+
+The user can then proceed to Register for an account at your instance of LubeLogger.
+

docs/documentation/GettingStarted.md

@@ -0,0 +1,75 @@
+# Getting Started
+## Docker
+The Docker Container Repository is the most reliable and up-to-date distribution channel for LubeLogger.
+You need to have Docker Windows installed and Virtualization enabled(typically a BIOS setting).
+
+You will then clone the following files onto your computer from the repository _.env_ and _docker-compose.yml_ or _docker-compose-traefik.yml_ if you're using Traefik.
+
+In the .env file you will find the following and here are the explanations for the variables.
+```
+LC_ALL=en_US.UTF-8 <- Locale and Language Settings, this will affect how numbers, currencies, and dates are formatted.
+LANG=en_US.UTF-8 <- Same as above. Note that some languages don't have UTF-8 encodings.
+MailConfig__EmailServer="" <- Email SMTP settings used only for configuring multiple users(to send their registration token and forgot password tokens)
+MailConfig__EmailFrom="" <- Same as above.
+MailConfig__UseSSL="false" <- Same as above.
+MailConfig__Port=587 <- Same as above.
+MailConfig__Username="" <- Same as above.
+MailConfig__Password="" <- Same as above.
+```
+
+Once you're happy with the configuration, run the following commands to pull down the image and run container.
+```
+docker pull ghcr.io/hargata/lubelogger:latest
+docker-compose up
+```
+By default the app will start listening at localhost:8080, this port can be configured in the docker-compose file.
+
+## Windows Standalone Executable
+Windows Standalone executables are provided on a request basis, and will usually be included with every other release.
+
+To run the server, you just have to double click on CarCareTracker.exe
+
+Occassionally you might run into an issue regarding a missing folder, to fix that, just create a "config" folder where CarCareTracker.exe is located.
+
+If you wish to set up SMTP when using this approach, you will have to configure the environment settings in appsettings.json located in the same folder as CarCareTracker.exe
+You just have to add the MailConfig section into it, but I provided the full appsettings.json anyways as an example.
+```
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "UseDarkMode": false,
+  "EnableCsvImports": true,
+  "UseMPG": true,
+  "UseDescending": false,
+  "EnableAuth": false,
+  "HideZero": false,
+  "EnableAutoReminderRefresh": false,
+  "EnableAutoOdometerInsert": false,
+  "UseUKMPG": false,
+  "UseThreeDecimalGasCost": true,
+  "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],
+  "DefaultTab": 8,
+  "UserNameHash": "",
+  "UserPasswordHash": "",
+  "MailConfig": {
+    "EmailServer": "",
+    "EmailFrom": "",
+    "UseSSL": true,
+    "Port": 587,
+    "Username": "",
+    "Password": ""
+  }
+}
+
+```
+When using this approach, the default port the app will be listening on is 5000, so you will navigate to localhost:5000
+
+## Test that It Works
+Whichever path you choose, once you get the app up and running, just navigate to the IP address and port the server is listening to and you should be able to see the app
+![image](https://github.com/hargata/lubelog/assets/155338622/a32c40ce-271c-406b-a211-c1f2af138418)
+![image](https://github.com/hargata/lubelog/assets/155338622/4e1c913c-001e-43fd-9b56-4ecffdfd4c2e)

docs/documentation/Registration.md

@@ -0,0 +1,22 @@
+# Registration
+Once they user have receive an email containing their LubeLogger token(pictured below), they can then register for an account.
+
+![image](https://github.com/hargata/lubelog/assets/155338622/80ef7208-bfaa-4cab-ba0e-c0a3ed6f255e)
+
+They can do so by navigating to your LubeLogger instance and clicking on the "Register" link.
+
+![image](https://github.com/hargata/lubelog/assets/155338622/99c1538d-5cfa-4ac8-8946-ef9eb7dfef9a)
+
+Then they just have to provide the token and their email address along with their set of credentials
+
+![image](https://github.com/hargata/lubelog/assets/155338622/c55d7d2d-1366-4fcf-970f-513e92a93c7a)
+
+**Note:** The email address and token are CASE SENSITIVE and MUST be identical to the email address that the token is generated for.
+
+![image](https://github.com/hargata/lubelog/assets/155338622/b77d49ef-d3e3-43bf-9792-360f305ad379)
+
+Once the user has registered successfully, they can then log in using their credentials.
+
+You can also verify that in your panel the token is deleted and the user now shows up under list of users:
+
+![image](https://github.com/hargata/lubelog/assets/155338622/2f4a622a-cb44-4ba9-8b5d-691f677fee3d)

docs/index.html

@@ -25,8 +25,16 @@
                     <h6 class="display-6 text-center">Self-Hosted, Open-Source, Unconventionally-Named Vehicle Maintenance Records and Fuel Mileage Tracker</h6>
                 </div>
             </div>
-            <hr>
             <div class="row">
+                <div class="col-12 col-sm-6 col-md-2"><a class="btn btn-dark" href="#showcase">Showcase</a></div>
+                <div class="col-12 col-sm-6 col-md-2"><a class="btn btn-dark" href="#features">Features</a></div>
+                <div class="col-12 col-sm-6 col-md-2"><a class="btn btn-dark" href="#demo">Demo</a></div>
+                <div class="col-12 col-sm-6 col-md-2"><a class="btn btn-dark" href="#download">Download</a></div>
+                <div class="col-12 col-sm-6 col-md-2"><a class="btn btn-dark" href="https://docs.lubelogger.com">Docs</a></div>
+                <div class="col-12 col-sm-6 col-md-2"><a class="btn btn-dark" href="https://github.com/hargata/lubelog">GitHub Repo</a></div>
+            </div>
+			<hr>
+            <div class="row" id="showcase">
                 <div class="col-12 d-flex justify-content-center">
                     <h6 class="display-6 text-center">Showcase</h6>
                 </div>
@@ -38,6 +46,8 @@
                       <button type="button" data-bs-target="#carouselGallery" data-bs-slide-to="1"></button>
                       <button type="button" data-bs-target="#carouselGallery" data-bs-slide-to="2"></button>
                       <button type="button" data-bs-target="#carouselGallery" data-bs-slide-to="3"></button>
+                      <button type="button" data-bs-target="#carouselGallery" data-bs-slide-to="4"></button>
+                      <button type="button" data-bs-target="#carouselGallery" data-bs-slide-to="5"></button>
                     </div>
                     <div class="carousel-inner">
                       <div class="carousel-item active">
@@ -47,6 +57,20 @@
                           <p>All of your vehicles conveniently displayed in one place</p>
                         </div>
                       </div>
+                      <div class="carousel-item">
+                        <img src="dashboard.png" class="d-block w-100" alt="...">
+                        <div class="carousel-caption d-none d-md-block customCarouselCaption">
+                          <h5>Dashboard</h5>
+                          <p>Get an overview of your vehicle expenses</p>
+                        </div>
+                      </div>
+                      <div class="carousel-item">
+                        <img src="planner.png" class="d-block w-100" alt="...">
+                        <div class="carousel-caption d-none d-md-block customCarouselCaption">
+                          <h5>Planner(Kanban Board)</h5>
+                          <p>Plan and track the progress of your To-Do's</p>
+                        </div>
+                      </div>
                       <div class="carousel-item">
                         <img src="servicerecord.png" class="d-block w-100" alt="...">
                         <div class="carousel-caption d-none d-md-block customCarouselCaption">
@@ -80,7 +104,7 @@
                   </div>
             </div>
             <hr>
-            <div class="row">
+            <div class="row" id="features">
                 <div class="col-12 d-flex justify-content-center">
                     <h6 class="display-6 text-center">Features</h6>
                 </div>
@@ -91,24 +115,41 @@
                         <li class="list-group-item">Keeps track of all your maintenance, repair, and upgrade records</li>
                         <li class="list-group-item">Keeps track of your fuel economy(supports MPG, UK MPG, and L/100KM)</li>
                         <li class="list-group-item">Keeps track of taxes(registration, going fast tax, etc)</li>
+                        <li class="list-group-item">Keeps track of supplies(parts, fluids, etc)</li>
                         <li class="list-group-item">No limit on how many vehicles you have in your garage</li>
-                        <li class="list-group-item">Import existing records from CSV(supports imports from Fuelly for Fuel Records)</li>
+                        <li class="list-group-item">Import existing records from CSV(supports imports from Fuelly)</li>
                         <li class="list-group-item">Attach documents for each record(receipts, invoices, etc)</li>
                     </ul>
                 </div>
                 <div class="col-12 col-md-6">
                     <ul class="list-group">
-                        <li class="list-group-item">Set reminders so you never miss another scheduled maintenance</li>
+                        <li class="list-group-item">Keeps track of your To-Do's(Kanban Planner)</li>
+                        <li class="list-group-item">Set recurring reminders so you never miss another scheduled maintenance</li>
                         <li class="list-group-item">Dark Mode</li>
                         <li class="list-group-item">Mobile/Small screen support</li>
                         <li class="list-group-item">Basic Authentication for security</li>
-                        <li class="list-group-item">Coming Soon(API Endpoints)</li>
-                        <li class="list-group-item">Coming Soon(Consolidated Report Export - Just like CarFax)</li>
+                        <li class="list-group-item">API Endpoints</li>
+                        <li class="list-group-item">Consolidated Vehicle Maintenance Report</li>
                       </ul>
                 </div>
             </div>
             <hr>
-            <div class="row">
+            <div class="row" id="demo">
+                <div class="col-12 d-flex justify-content-center">
+                    <h6 class="display-6 text-center">Try It Out</h6>
+                </div>
+            </div>
+            <div class="col-12 d-flex justify-content-center">
+                <p class="lead">
+                    Live demo available <a href="https://demo.lubelogger.com">here</a>
+                </p>
+            </div>
+            <div class="col-12 d-flex justify-content-center">
+                <p class="lead">Login to the demo using the username "test" and password "1234". The demo site resets every 20 minutes.
+                </p>
+            </div>
+            <hr>
+            <div class="row" id="download">
                 <div class="col-12 d-flex justify-content-center">
                     <h6 class="display-6 text-center">Where to Download</h6>
                 </div>
@@ -152,7 +193,14 @@
             <hr>
             <div class="row">
                 <div class="col-12 d-flex justify-content-center">
-                    <p class="lead">LubeLogger is proudly developed in Price Utah by Hargata Softworks
+                    <h6 class="display-6 text-center">About</h6>
+                </div>
+                <div class="col-12 d-flex justify-content-center">
+                    <p class="lead">LubeLogger is proudly developed in Price Utah by Hargata Softworks.
+                    </p>
+                </div>
+                <div class="col-12 d-flex justify-content-center">
+                    <p class="lead"><a href="https://www.patreon.com/LubeLogger">Support us on Patreon</a>
                     </p>
                 </div>
                 <div class="col-12 d-flex justify-content-center">

docs/screenshots.md

@@ -1,6 +1,9 @@
 ## Garage
 ![image](https://github.com/hargata/lubelog/assets/155338622/c15a4efb-89d5-4eca-bccd-f148bf063f80)
 
+## Planner(Kanban Board)
+![image](https://github.com/hargata/lubelog/assets/155338622/6775d553-1545-4655-b9f9-259618af283b)
+
 ## Dashboard
 ![image](https://github.com/hargata/lubelog/assets/155338622/970f8e8e-bef9-4de2-b43c-dfa1d43c2d87)
 
@@ -24,7 +27,7 @@
 ![image](https://github.com/hargata/lubelog/assets/155338622/ab326041-9d65-4bd9-9543-1549be80a88b)
 
 ## Settings
-![image](https://github.com/hargata/lubelog/assets/155338622/3906a101-cb5e-45e3-9cfc-96bf75dfb337)
+![image](https://github.com/hargata/lubelog/assets/155338622/c20550ec-c195-40c0-a857-3cbb5479bf78)
 
 ## Admin Panel (Generate Tokens for new users to sign up)
 ![image](https://github.com/hargata/lubelog/assets/155338622/60cd0dc1-3444-4917-aaf9-aa64a5e62202)

wwwroot/css/site.css

@@ -111,6 +111,13 @@ html {
             width: 30%;
         }
 
+    .col-2.servicehistorytype {
+        width: 13%;
+    }
+    .col-1.servicehistorydate{
+        width: 13%;
+    }
+
     th.col-1 {
         width: 10%;
     }

wwwroot/js/collisionrecord.js

@@ -15,6 +15,11 @@ function showEditCollisionRecordModal(collisionRecordId) {
             //initiate datepicker
             initDatePicker($('#collisionRecordDate'));
             $('#collisionRecordModal').modal('show');
+            $('#collisionRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("collisionRecordNotes");
+                }
+            });
         }
     });
 }
@@ -71,7 +76,7 @@ function saveCollisionRecordToVehicle(isEdit) {
 }
 function getAndValidateCollisionRecordValues() {
     var collisionDate = $("#collisionRecordDate").val();
-    var collisionMileage = $("#collisionRecordMileage").val();
+    var collisionMileage = parseInt(globalParseFloat($("#collisionRecordMileage").val())).toString();
     var collisionDescription = $("#collisionRecordDescription").val();
     var collisionCost = $("#collisionRecordCost").val();
     var collisionNotes = $("#collisionRecordNotes").val();
@@ -114,6 +119,7 @@ function getAndValidateCollisionRecordValues() {
         cost: collisionCost,
         notes: collisionNotes,
         files: uploadedFiles,
+        supplies: selectedSupplies,
         addReminderRecord: addReminderRecord
     }
 }

wwwroot/js/garage.js

@@ -28,4 +28,27 @@ function performLogOut() {
             window.location.href = '/Login';
         }
     })
+}
+function loadPinnedNotes(vehicleId) {
+    var hoveredGrid = $(`#gridVehicle_${vehicleId}`);
+    if (hoveredGrid.attr("data-bs-title") == undefined) {
+        $.get(`/Vehicle/GetPinnedNotesByVehicleId?vehicleId=${vehicleId}`, function (data) {
+            if (data.length > 0) {
+                //converted pinned notes to html.
+                var htmlString = "<ul class='list-group list-group-flush'>";
+                data.forEach(x => {
+                    htmlString += `<li><b>${x.description}</b> : ${x.noteText}</li>`;
+                });
+                htmlString += "</ul>";
+                hoveredGrid.attr("data-bs-title", htmlString);
+                new bootstrap.Tooltip(hoveredGrid);
+                hoveredGrid.tooltip("show");
+            }
+        });
+    } else {
+        hoveredGrid.tooltip("show");
+    }
+}
+function hidePinnedNotes(vehicleId) {
+    $(`#gridVehicle_${vehicleId}`).tooltip("hide");
 }

wwwroot/js/gasrecord.js

@@ -1,5 +1,5 @@
 function showAddGasRecordModal() {
-    $.get('/Vehicle/GetAddGasRecordPartialView', function (data) {
+    $.get(`/Vehicle/GetAddGasRecordPartialView?vehicleId=${GetVehicleId().vehicleId}`, function (data) {
         if (data) {
             $("#gasRecordModalContent").html(data);
             //initiate datepicker
@@ -15,6 +15,11 @@ function showEditGasRecordModal(gasRecordId) {
             //initiate datepicker
             initDatePicker($('#gasRecordDate'));
             $('#gasRecordModal').modal('show');
+            $('#gasRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("gasRecordNotes");
+                }
+            });
         }
     });
 }
@@ -68,7 +73,7 @@ function saveGasRecordToVehicle(isEdit) {
 }
 function getAndValidateGasRecordValues() {
     var gasDate = $("#gasRecordDate").val();
-    var gasMileage = $("#gasRecordMileage").val();
+    var gasMileage = parseInt(globalParseFloat($("#gasRecordMileage").val())).toString();
     var gasGallons = $("#gasRecordGallons").val();
     var gasCost = $("#gasRecordCost").val();
     var gasCostType = $("#gasCostType").val();
@@ -91,20 +96,20 @@ function getAndValidateGasRecordValues() {
     } else {
         $("#gasRecordMileage").removeClass("is-invalid");
     }
-    if (gasGallons.trim() == '' || parseFloat(gasGallons) <= 0) {
+    if (gasGallons.trim() == '' || globalParseFloat(gasGallons) <= 0) {
         hasError = true;
         $("#gasRecordGallons").addClass("is-invalid");
     } else {
         $("#gasRecordGallons").removeClass("is-invalid");
     }
     if (gasCostType != undefined && gasCostType == 'unit') {
-        var convertedGasCost = parseFloat(gasCost) * parseFloat(gasGallons);
-        gasCost = convertedGasCost.toFixed(2).toString();
-        if (isNaN(gasCost))
+        var convertedGasCost = globalParseFloat(gasCost) * globalParseFloat(gasGallons);
+        if (isNaN(convertedGasCost))
         {
             hasError = true;
             $("#gasRecordCost").addClass("is-invalid");
         } else {
+            gasCost = globalFloatToString(convertedGasCost.toFixed(2).toString());
             $("#gasRecordCost").removeClass("is-invalid");
         }
     }

wwwroot/js/note.js

@@ -11,6 +11,11 @@ function showEditNoteModal(noteId) {
         if (data) {
             $("#noteModalContent").html(data);
             $('#noteModal').modal('show');
+            $('#noteModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("noteTextArea");
+                }
+            });
         }
     });
 }
@@ -67,6 +72,7 @@ function getAndValidateNoteValues() {
     var noteText = $("#noteTextArea").val();
     var vehicleId = GetVehicleId().vehicleId;
     var noteId = getNoteModelData().id;
+    var noteIsPinned = $("#noteIsPinned").is(":checked");
     //validation
     var hasError = false;
     if (noteDescription.trim() == '') { //eliminates whitespace.
@@ -86,6 +92,7 @@ function getAndValidateNoteValues() {
         hasError: hasError,
         vehicleId: vehicleId,
         description: noteDescription,
-        noteText: noteText
+        noteText: noteText,
+        pinned: noteIsPinned
     }
 }

wwwroot/js/odometerrecord.js

@@ -15,6 +15,11 @@ function showEditOdometerRecordModal(odometerRecordId) {
             //initiate datepicker
             initDatePicker($('#odometerRecordDate'));
             $('#odometerRecordModal').modal('show');
+            $('#odometerRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("odometerRecordNotes");
+                }
+            });
         }
     });
 }
@@ -71,7 +76,7 @@ function saveOdometerRecordToVehicle(isEdit) {
 }
 function getAndValidateOdometerRecordValues() {
     var serviceDate = $("#odometerRecordDate").val();
-    var serviceMileage = $("#odometerRecordMileage").val();
+    var serviceMileage = parseInt(globalParseFloat($("#odometerRecordMileage").val())).toString();
     var serviceNotes = $("#odometerRecordNotes").val();
     var vehicleId = GetVehicleId().vehicleId;
     var odometerRecordId = getOdometerRecordModelData().id;

wwwroot/js/planrecord.js

@@ -15,6 +15,11 @@ function showEditPlanRecordModal(planRecordId) {
             //initiate datepicker
             initDatePicker($('#planRecordDate'));
             $('#planRecordModal').modal('show');
+            $('#planRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("planRecordNotes");
+                }
+            });
         }
     });
 }
@@ -102,6 +107,7 @@ function getAndValidatePlanRecordValues() {
         cost: planCost,
         notes: planNotes,
         files: uploadedFiles,
+        supplies: selectedSupplies,
         priority: planPriority,
         progress: planProgress,
         importMode: planType

wwwroot/js/reminderrecord.js

@@ -4,6 +4,11 @@
             $("#reminderRecordModalContent").html(data); 
             initDatePicker($('#reminderDate'), true);
             $("#reminderRecordModal").modal("show");
+            $('#reminderRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("reminderNotes");
+                }
+            });
         }
     });
 }
@@ -81,9 +86,22 @@ function enableRecurring() {
     }
 }
 
+function markDoneReminderRecord(reminderRecordId, e) {
+    event.stopPropagation();
+    var vehicleId = GetVehicleId().vehicleId;
+    $.post(`/Vehicle/PushbackRecurringReminderRecord?reminderRecordId=${reminderRecordId}`, function (data) {
+        if (data) {
+            successToast("Reminder Updated");
+            getVehicleReminders(vehicleId);
+        } else {
+            errorToast("An error has occurred, please try again later.");
+        }
+    });
+}
+
 function getAndValidateReminderRecordValues() {
     var reminderDate = $("#reminderDate").val();
-    var reminderMileage = $("#reminderMileage").val();
+    var reminderMileage = parseInt(globalParseFloat($("#reminderMileage").val())).toString();
     var reminderDescription = $("#reminderDescription").val();
     var reminderNotes = $("#reminderNotes").val();
     var reminderOption = $('#reminderOptions input:radio:checked').val();

wwwroot/js/reports.js

@@ -12,12 +12,8 @@ function generateVehicleHistoryReport() {
         }
     })
 }
-var debounce = null;
-function updateCheck(sender) {
-    clearTimeout(debounce);
-    debounce = setTimeout(function () {
-        refreshBarChart();
-    }, 1000);
+function updateCheck() {
+    setDebounce(refreshBarChart);
 }
 function refreshMPGChart() {
     var vehicleId = GetVehicleId().vehicleId;
@@ -26,7 +22,7 @@ function refreshMPGChart() {
         $("#monthFuelMileageReportContent").html(data);
     })
 }
-function refreshBarChart(callBack) {
+function refreshBarChart() {
     var selectedMetrics = [];
     var vehicleId = GetVehicleId().vehicleId;
     var year = getYear();
@@ -78,4 +74,60 @@ function refreshCollaborators() {
     $.get(`/Vehicle/GetCollaboratorsForVehicle?vehicleId=${vehicleId}`, function (data) {
         $("#collaboratorContent").html(data);
     });
+}
+function exportAttachments() {
+    Swal.fire({
+        title: 'Export Attachments',
+        html: `
+        <div id='attachmentTabs'>
+        <div class='form-check form-check-inline'>
+        <input type="checkbox" id="exportServiceRecord" class="form-check-input me-1" value='ServiceRecord'>
+        <label for="exportServiceRecord" class='form-check-label'>Service Record</label>
+        </div>
+        <div class='form-check form-check-inline'>
+        <input type="checkbox" id="exportRepairRecord" class="form-check-input me-1" value='RepairRecord'>
+        <label for="exportRepairRecord" class='form-check-label'>Repairs</label>
+        </div>
+        <div class='form-check form-check-inline'>
+        <input type="checkbox" id="exportUpgradeRecord" class="form-check-input me-1" value='UpgradeRecord'>
+        <label for="exportUpgradeRecord" class='form-check-label'>Upgrades</label>
+        </div>
+        <div class='form-check form-check-inline'>
+        <input type="checkbox" id="exportGasRecord" class="form-check-input me-1" value='GasRecord'>
+        <label for="exportGasRecord" class='form-check-label'>Fuel</label>
+        </div>
+        <div class='form-check form-check-inline'>
+        <input type="checkbox" id="exportTaxRecord" class="form-check-input me-1" value='TaxRecord'>
+        <label for="exportTaxRecord" class='form-check-label'>Taxes</label>
+        </div>
+         <div class='form-check form-check-inline'>
+        <input type="checkbox" id="exportOdometerRecord" class="form-check-input me-1" value='OdometerRecord'>
+        <label for="exportOdometerRecord" class='form-check-label'>Odometer</label>
+        </div>
+        </div>
+        `,
+        confirmButtonText: 'Export',
+        showCancelButton: true,
+        focusConfirm: false,
+        preConfirm: () => {
+            var selectedExportTabs = $("#attachmentTabs :checked").map(function () {
+                return this.value;
+            });
+            if (selectedExportTabs.toArray().length == 0) {
+                Swal.showValidationMessage(`Please make at least one selection`)
+            }
+            return { selectedTabs: selectedExportTabs.toArray() }
+        },
+    }).then(function (result) {
+        if (result.isConfirmed) {
+            var vehicleId = GetVehicleId().vehicleId;
+            $.post('/Vehicle/GetVehicleAttachments', { vehicleId: vehicleId, exportTabs: result.value.selectedTabs }, function (data) {
+                if (data.success) {
+                    window.location.href = data.message;
+                } else {
+                    errorToast(data.message);
+                }
+            })
+        }
+    });
 }

wwwroot/js/servicerecord.js

@@ -15,6 +15,11 @@ function showEditServiceRecordModal(serviceRecordId) {
             //initiate datepicker
             initDatePicker($('#serviceRecordDate'));
             $('#serviceRecordModal').modal('show');
+            $('#serviceRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("serviceRecordNotes");
+                }
+            });
         }
     });
 }
@@ -71,7 +76,7 @@ function saveServiceRecordToVehicle(isEdit) {
 }
 function getAndValidateServiceRecordValues() {
     var serviceDate = $("#serviceRecordDate").val();
-    var serviceMileage = $("#serviceRecordMileage").val();
+    var serviceMileage = parseInt(globalParseFloat($("#serviceRecordMileage").val())).toString();
     var serviceDescription = $("#serviceRecordDescription").val();
     var serviceCost = $("#serviceRecordCost").val();
     var serviceNotes = $("#serviceRecordNotes").val();
@@ -114,6 +119,7 @@ function getAndValidateServiceRecordValues() {
         cost: serviceCost,
         notes: serviceNotes,
         files: uploadedFiles,
+        supplies: selectedSupplies,
         addReminderRecord: addReminderRecord
     }
 }

wwwroot/js/shared.js

@@ -38,6 +38,7 @@ function saveVehicle(isEdit) {
     var vehicleModel = $("#inputModel").val();
     var vehicleLicensePlate = $("#inputLicensePlate").val();
     var vehicleIsElectric = $("#inputIsElectric").is(":checked");
+    var vehicleUseHours = $("#inputUseHours").is(":checked");
     //validate
     var hasError = false;
     if (vehicleYear.trim() == '' || parseInt(vehicleYear) < 1900) {
@@ -74,7 +75,8 @@ function saveVehicle(isEdit) {
         make: vehicleMake,
         model: vehicleModel,
         licensePlate: vehicleLicensePlate,
-        isElectric: vehicleIsElectric
+        isElectric: vehicleIsElectric,
+        useHours: vehicleUseHours
     }, function (data) {
         if (data) {
             if (!isEdit) {
@@ -108,6 +110,10 @@ function uploadFileAsync(event) {
             if (response.trim() != '') {
                 uploadedFile = response;
             }
+        },
+        error: function () {
+            sloader.hide();
+            errorToast("An error has occurred, please check the file size and try again later.")
         }
     });
 }
@@ -147,4 +153,68 @@ function decodeHTMLEntities(text) {
     return $("<textarea/>")
         .html(text)
         .text();
+}
+var debounce = null;
+function setDebounce(callBack) {
+    clearTimeout(debounce);
+    debounce = setTimeout(function () {
+        callBack();
+    }, 1000);
+}
+var storedTableRowState = null;
+function toggleSort(tabName, sender) {
+    var sortColumn = sender.textContent;
+    var sortAscIcon = '<i class="bi bi-sort-numeric-down ms-2"></i>';
+    var sortDescIcon = '<i class="bi bi-sort-numeric-down-alt ms-2"></i>';
+    sender = $(sender);
+    //order of sort - asc, desc, reset
+    if (sender.hasClass('sort-asc')) {
+        sender.removeClass('sort-asc');
+        sender.addClass('sort-desc');
+        sender.html(`${sortColumn}${sortDescIcon}`);
+        sortTable(tabName, sortColumn, true);
+    } else if (sender.hasClass('sort-desc')) {
+        //restore table
+        sender.removeClass('sort-desc');
+        sender.html(`${sortColumn}`);
+        $(`#${tabName} table tbody`).html(storedTableRowState);
+    } else {
+        //first time sorting.
+        //check if table was sorted before by a different column(only relevant to fuel tab)
+        if (storedTableRowState != null && ($(".sort-asc").length > 0 || $(".sort-desc").length > 0)) {
+            //restore table state.
+            $(`#${tabName} table tbody`).html(storedTableRowState);
+            //reset other sorted columns
+            if ($(".sort-asc").length > 0) {
+                $(".sort-asc").html($(".sort-asc").html().replace(sortAscIcon, ""));
+                $(".sort-asc").removeClass("sort-asc");
+            }
+            if ($(".sort-desc").length > 0) {
+                $(".sort-desc").html($(".sort-desc").html().replace(sortDescIcon, ""));
+                $(".sort-desc").removeClass("sort-desc");
+            }
+        }
+        sender.addClass('sort-asc');
+        sender.html(`${sortColumn}${sortAscIcon}`);
+        storedTableRowState = null;
+        storedTableRowState = $(`#${tabName} table tbody`).html();
+        sortTable(tabName, sortColumn, false);
+    }
+}
+function sortTable(tabName, columnName, desc) {
+    //get column index.
+    var columns = $(`#${tabName} table th`).toArray().map(x => x.innerText);
+    var colIndex = columns.findIndex(x => x == columnName);
+    //get row data
+    var rowData = $(`#${tabName} table tbody tr`);
+    var sortedRow = rowData.toArray().sort((a, b) => {
+        var currentVal = globalParseFloat(a.children[colIndex].textContent);
+        var nextVal = globalParseFloat(b.children[colIndex].textContent);
+        if (desc) {
+            return nextVal - currentVal;
+        } else {
+            return currentVal - nextVal;
+        }
+    });
+    $(`#${tabName} table tbody`).html(sortedRow);
 }

wwwroot/js/supplyrecord.js

@@ -15,6 +15,11 @@ function showEditSupplyRecordModal(supplyRecordId) {
             //initiate datepicker
             initDatePicker($('#supplyRecordDate'));
             $('#supplyRecordModal').modal('show');
+            $('#supplyRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("supplyRecordNotes");
+                }
+            });
         }
     });
 }
@@ -93,7 +98,7 @@ function getAndValidateSupplyRecordValues() {
     } else {
         $("#supplyRecordDescription").removeClass("is-invalid");
     }
-    if (supplyQuantity.trim() == '' || !isValidMoney(supplyQuantity) || parseFloat(supplyQuantity) < 0) {
+    if (supplyQuantity.trim() == '' || !isValidMoney(supplyQuantity) || globalParseFloat(supplyQuantity) < 0) {
         hasError = true;
         $("#supplyRecordQuantity").addClass("is-invalid");
     } else {

wwwroot/js/taxrecord.js

@@ -15,9 +15,22 @@ function showEditTaxRecordModal(taxRecordId) {
             //initiate datepicker
             initDatePicker($('#taxRecordDate'));
             $('#taxRecordModal').modal('show');
+            $('#taxRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("taxRecordNotes");
+                }
+            });
         }
     });
 }
+function enableTaxRecurring() {
+    var taxIsRecurring = $("#taxIsRecurring").is(":checked");
+    if (taxIsRecurring) {
+        $("#taxRecurringMonth").attr('disabled', false);
+    } else {
+        $("#taxRecurringMonth").attr('disabled', true);
+    }
+}
 function hideAddTaxRecordModal() {
     $('#taxRecordModal').modal('hide');
 }
@@ -76,6 +89,8 @@ function getAndValidateTaxRecordValues() {
     var taxNotes = $("#taxRecordNotes").val();
     var vehicleId = GetVehicleId().vehicleId;
     var taxRecordId = getTaxRecordModelData().id;
+    var taxIsRecurring = $("#taxIsRecurring").is(":checked");
+    var taxRecurringMonth = $("#taxRecurringMonth").val();
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
@@ -105,6 +120,8 @@ function getAndValidateTaxRecordValues() {
         description: taxDescription,
         cost: taxCost,
         notes: taxNotes,
+        isRecurring: taxIsRecurring,
+        recurringInterval: taxRecurringMonth,
         files: uploadedFiles,
         addReminderRecord: addReminderRecord
     }

wwwroot/js/upgraderecord.js

@@ -15,6 +15,11 @@ function showEditUpgradeRecordModal(upgradeRecordId) {
             //initiate datepicker
             initDatePicker($('#upgradeRecordDate'));
             $('#upgradeRecordModal').modal('show');
+            $('#upgradeRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("upgradeRecordNotes");
+                }
+            });
         }
     });
 }
@@ -71,7 +76,7 @@ function saveUpgradeRecordToVehicle(isEdit) {
 }
 function getAndValidateUpgradeRecordValues() {
     var upgradeDate = $("#upgradeRecordDate").val();
-    var upgradeMileage = $("#upgradeRecordMileage").val();
+    var upgradeMileage = parseInt(globalParseFloat($("#upgradeRecordMileage").val())).toString();
     var upgradeDescription = $("#upgradeRecordDescription").val();
     var upgradeCost = $("#upgradeRecordCost").val();
     var upgradeNotes = $("#upgradeRecordNotes").val();
@@ -114,6 +119,7 @@ function getAndValidateUpgradeRecordValues() {
         cost: upgradeCost,
         notes: upgradeNotes,
         files: uploadedFiles,
+        supplies: selectedSupplies,
         addReminderRecord: addReminderRecord
     }
 }

wwwroot/js/vehicle.js

@@ -278,6 +278,10 @@ function uploadVehicleFilesAsync(event) {
             if (response.length > 0) {
                 uploadedFiles.push.apply(uploadedFiles, response);
             }
+        },
+        error: function () {
+            sloader.hide();
+            errorToast("An error has occurred, please check the file size and try again later.")
         }
     });
 }
@@ -313,7 +317,11 @@ function getVehicleHaveImportantReminders(vehicleId) {
         });
     }, 500);
 }
-
+function printTab() {
+    setTimeout(function () {
+        window.print();
+    }, 500);
+}
 function deleteFileFromUploadedFiles(fileLocation, event) {
     event.parentElement.parentElement.parentElement.remove();
     uploadedFiles = uploadedFiles.filter(x => x.location != fileLocation);
@@ -349,4 +357,82 @@ function saveScrollPosition() {
 function restoreScrollPosition() {
     $(".vehicleDetailTabContainer").scrollTop(scrollPosition);
     scrollPosition = 0;
+}
+function moveRecord(recordId, source, dest) {
+    $("#workAroundInput").show();
+    var friendlySource = "";
+    var friendlyDest = "";
+    var hideModalCallBack;
+    var refreshDataCallBack;
+    switch (source) {
+        case "ServiceRecord":
+            friendlySource = "Service Records";
+            hideModalCallBack = hideAddServiceRecordModal;
+            refreshDataCallBack = getVehicleServiceRecords;
+            break;
+        case "RepairRecord":
+            friendlySource = "Repairs";
+            hideModalCallBack = hideAddCollisionRecordModal;
+            refreshDataCallBack = getVehicleCollisionRecords;
+            break;
+        case "UpgradeRecord":
+            friendlySource = "Upgrades";
+            hideModalCallBack = hideAddUpgradeRecordModal;
+            refreshDataCallBack = getVehicleUpgradeRecords;
+            break;
+    }
+    switch (dest) {
+        case "ServiceRecord":
+            friendlyDest = "Service Records";
+            break;
+        case "RepairRecord":
+            friendlyDest = "Repairs";
+            break;
+        case "UpgradeRecord":
+            friendlyDest = "Upgrades";
+            break;
+    }
+    Swal.fire({
+        title: "Confirm Move?",
+        text: `Move this record from ${friendlySource} to ${friendlyDest}?`,
+        showCancelButton: true,
+        confirmButtonText: "Move",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post('/Vehicle/MoveRecord', {recordId: recordId, source: source, destination: dest }, function (data) {
+                if (data) {
+                    hideModalCallBack();
+                    successToast("Record Moved");
+                    var vehicleId = GetVehicleId().vehicleId;
+                    refreshDataCallBack(vehicleId);
+                } else {
+                    errorToast("An error has occurred, please try again later.");
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
+function toggleMarkDownOverlay(textAreaName) {
+    var textArea = $(`#${textAreaName}`);
+    if ($(".markdown-overlay").length > 0) {
+        $(".markdown-overlay").remove();
+        return;
+    }
+    var text = textArea.val();
+    if (text == undefined) {
+        return;
+    }
+    if (text.length > 0) {
+        var formatted = markdown(text);
+        //var overlay div
+        var overlayDiv = `<div class='markdown-overlay' style="z-index: 1060; position:absolute; top:${textArea.css('top')}; left:${textArea.css('left')}; width:${textArea.css('width')}; height:${textArea.css('height')}; padding:${textArea.css('padding')}; overflow-y:auto; background-color:var(--bs-modal-bg);">${formatted}</div>`;
+        textArea.parent().children(`label[for=${textAreaName}]`).append(overlayDiv);
+    }
+}
+function showLinks(e) {
+    var textAreaName = $(e.parentElement).attr("for");
+    toggleMarkDownOverlay(textAreaName);
 }

wwwroot/lib/drawdown/drawdown.js

@@ -0,0 +1,129 @@
+/**
+ * drawdown.js
+ * (c) Adam Leggett
+ */
+
+
+;function markdown(src) {
+
+    var rx_lt = /</g;
+    var rx_gt = />/g;
+    var rx_space = /\t|\r|\uf8ff/g;
+    var rx_escape = /\\([\\\|`*_{}\[\]()#+\-~])/g;
+    var rx_hr = /^([*\-=_] *){3,}$/gm;
+    var rx_blockquote = /\n *&gt; *([^]*?)(?=(\n|$){2})/g;
+    var rx_list = /\n( *)(?:[*\-+]|((\d+)|([a-z])|[A-Z])[.)]) +([^]*?)(?=(\n|$){2})/g;
+    var rx_listjoin = /<\/(ol|ul)>\n\n<\1>/g;
+    var rx_highlight = /(^|[^A-Za-z\d\\])(([*_])|(~)|(\^)|(--)|(\+\+)|`)(\2?)([^<]*?)\2\8(?!\2)(?=\W|_|$)/g;
+    var rx_code = /\n((```|~~~).*\n?([^]*?)\n?\2|((    .*?\n)+))/g;
+    var rx_link = /((!?)\[(.*?)\]\((.*?)( ".*")?\)|\\([\\`*_{}\[\]()#+\-.!~]))/g;
+    var rx_table = /\n(( *\|.*?\| *\n)+)/g;
+    var rx_thead = /^.*\n( *\|( *\:?-+\:?-+\:? *\|)* *\n|)/;
+    var rx_row = /.*\n/g;
+    var rx_cell = /\||(.*?[^\\])\|/g;
+    var rx_heading = /(?=^|>|\n)([>\s]*?)(#{1,6}) (.*?)( #*)? *(?=\n|$)/g;
+    var rx_para = /(?=^|>|\n)\s*\n+([^<]+?)\n+\s*(?=\n|<|$)/g;
+    var rx_stash = /-\d+\uf8ff/g;
+
+    function replace(rex, fn) {
+        src = src.replace(rex, fn);
+    }
+
+    function element(tag, content) {
+        return '<' + tag + '>' + content + '</' + tag + '>';
+    }
+
+    function blockquote(src) {
+        return src.replace(rx_blockquote, function(all, content) {
+            return element('blockquote', blockquote(highlight(content.replace(/^ *&gt; */gm, ''))));
+        });
+    }
+
+    function list(src) {
+        return src.replace(rx_list, function(all, ind, ol, num, low, content) {
+            var entry = element('li', highlight(content.split(
+                RegExp('\n ?' + ind + '(?:(?:\\d+|[a-zA-Z])[.)]|[*\\-+]) +', 'g')).map(list).join('</li><li>')));
+
+            return '\n' + (ol
+                ? '<ol start="' + (num
+                    ? ol + '">'
+                    : parseInt(ol,36) - 9 + '" style="list-style-type:' + (low ? 'low' : 'upp') + 'er-alpha">') + entry + '</ol>'
+                : element('ul', entry));
+        });
+    }
+
+    function highlight(src) {
+        return src.replace(rx_highlight, function(all, _, p1, emp, sub, sup, small, big, p2, content) {
+            return _ + element(
+                  emp ? (p2 ? 'strong' : 'em')
+                : sub ? (p2 ? 's' : 'sub')
+                : sup ? 'sup'
+                : small ? 'small'
+                : big ? 'big'
+                : 'code',
+                highlight(content));
+        });
+    }
+
+    function unesc(str) {
+        return str.replace(rx_escape, '$1');
+    }
+
+    var stash = [];
+    var si = 0;
+
+    src = '\n' + src + '\n';
+
+    replace(rx_lt, '&lt;');
+    replace(rx_gt, '&gt;');
+    replace(rx_space, '  ');
+
+    // blockquote
+    src = blockquote(src);
+
+    // horizontal rule
+    replace(rx_hr, '<hr/>');
+
+    // list
+    src = list(src);
+    replace(rx_listjoin, '');
+
+    // code
+    replace(rx_code, function(all, p1, p2, p3, p4) {
+        stash[--si] = element('pre', element('code', p3||p4.replace(/^    /gm, '')));
+        return si + '\uf8ff';
+    });
+
+    // link or image
+    replace(rx_link, function(all, p1, p2, p3, p4, p5, p6) {
+        stash[--si] = p4
+            ? p2
+                ? '<img src="' + p4 + '" alt="' + p3 + '"/>'
+                : '<a href="' + p4 + '">' + unesc(highlight(p3)) + '</a>'
+            : p6;
+        return si + '\uf8ff';
+    });
+
+    // table
+    replace(rx_table, function(all, table) {
+        var sep = table.match(rx_thead)[1];
+        return '\n' + element('table',
+            table.replace(rx_row, function(row, ri) {
+                return row == sep ? '' : element('tr', row.replace(rx_cell, function(all, cell, ci) {
+                    return ci ? element(sep && !ri ? 'th' : 'td', unesc(highlight(cell || ''))) : ''
+                }))
+            })
+        )
+    });
+
+    // heading
+    replace(rx_heading, function(all, _, p1, p2) { return _ + element('h' + p1.length, unesc(highlight(p2))) });
+
+    // paragraph
+    replace(rx_para, function(all, content) { return element('p', unesc(highlight(content))) });
+
+    // stash
+    replace(rx_stash, function(all) { return stash[parseInt(all)] });
+
+    return src.trim();
+};