Merge pull request #129 from hargata/Hargata/to.do

escape datecreated string

.env

@@ -2,7 +2,7 @@ LC_ALL=en_US.UTF-8
 LANG=en_US.UTF-8
 MailConfig__EmailServer=""
 MailConfig__EmailFrom=""
-MailConfig__UseSSL=""
+MailConfig__UseSSL="false"
 MailConfig__Port=587
 MailConfig__Username=""
 MailConfig__Password=""

.github/workflows/dockerhub-docker-image.yml

@@ -0,0 +1,30 @@
+name: Docker Image To Docker Hub
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
+      with:
+          username: "${{ secrets.DH_USER }}"
+          password: "${{ secrets.DH_PASS }}"
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            hargata/lubelogger:latest

.github/workflows/ghcr-docker-image.yml

@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: Docker Image To GHCR
 
 on:
   push:
@@ -25,7 +25,7 @@ jobs:
       uses: docker/build-push-action@v5
       with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/hargata/lubelogger:latest

Controllers/APIController.cs

@@ -1,4 +1,5 @@
-using CarCareTracker.External.Interfaces;
+using CarCareTracker.External.Implementations;
+using CarCareTracker.External.Interfaces;
 using CarCareTracker.Filter;
 using CarCareTracker.Helper;
 using CarCareTracker.Logic;
@@ -20,9 +21,11 @@ namespace CarCareTracker.Controllers
         private readonly ITaxRecordDataAccess _taxRecordDataAccess;
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
         private readonly IGasHelper _gasHelper;
         private readonly IUserLogic _userLogic;
+        private readonly IFileHelper _fileHelper;
         public APIController(IVehicleDataAccess dataAccess,
             IGasHelper gasHelper,
             IReminderHelper reminderHelper,
@@ -33,6 +36,8 @@ namespace CarCareTracker.Controllers
             ITaxRecordDataAccess taxRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            IOdometerRecordDataAccess odometerRecordDataAccess,
+            IFileHelper fileHelper,
             IUserLogic userLogic) 
         {
             _dataAccess = dataAccess;
@@ -43,9 +48,11 @@ namespace CarCareTracker.Controllers
             _taxRecordDataAccess = taxRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _odometerRecordDataAccess = odometerRecordDataAccess;
             _gasHelper = gasHelper;
             _reminderHelper = reminderHelper;
             _userLogic = userLogic;
+            _fileHelper = fileHelper;
         }
         public IActionResult Index()
         {
@@ -103,11 +110,62 @@ namespace CarCareTracker.Controllers
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
+        [Route("/api/vehicle/odometerrecords")]
+        public IActionResult OdometerRecords(int vehicleId)
+        {
+            var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Odometer = x.Mileage.ToString(), Notes = x.Notes });
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        [Route("/api/vehicle/odometerrecords/add")]
+        public IActionResult AddOdometerRecord(int vehicleId, OdometerRecordExportModel input)
+        {
+            var response = new OperationResponse();
+            if (vehicleId == default)
+            {
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                return Json(response);
+            }
+            try
+            {
+                var odometerRecord = new OdometerRecord()
+                {
+                    VehicleId = vehicleId,
+                    Date = DateTime.Parse(input.Date),
+                    Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    Mileage = int.Parse(input.Odometer)
+                };
+                _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                response.Success = true;
+                response.Message = "Odometer Record Added";
+                return Json(response);
+            } catch (Exception ex)
+            {
+                response.Success = false;
+                response.Message = StaticHelper.GenericErrorMessage;
+                return Json(response);
+            }
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
         [Route("/api/vehicle/gasrecords")]
         public IActionResult GasRecords(int vehicleId, bool useMPG, bool useUKMPG)
         {
             var vehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
-            var result = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG).Select(x => new GasRecordExportModel { Date = x.Date, Odometer = x.Mileage.ToString(), Cost = x.Cost.ToString(), FuelConsumed = x.Gallons.ToString(), FuelEconomy = x.MilesPerGallon.ToString()});
+            var result = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG)
+                .Select(x => new GasRecordExportModel { 
+                    Date = x.Date, 
+                    Odometer = x.Mileage.ToString(), 
+                    Cost = x.Cost.ToString(), 
+                    FuelConsumed = x.Gallons.ToString(), 
+                    FuelEconomy = x.MilesPerGallon.ToString(),
+                    IsFillToFull = x.IsFillToFull.ToString(),
+                    MissedFuelUp = x.MissedFuelUp.ToString(),
+                    Notes = x.Notes
+                });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -120,6 +178,14 @@ namespace CarCareTracker.Controllers
             var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).Select(x=> new ReminderExportModel {  Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes});
             return Json(results);
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
+        [Route("/api/makebackup")]
+        public IActionResult MakeBackup()
+        {
+            var result = _fileHelper.MakeBackup();
+            return Json(result);
+        }
         private int GetMaxMileage(int vehicleId)
         {
             var numbersArray = new List<int>();
@@ -143,6 +209,11 @@ namespace CarCareTracker.Controllers
             {
                 numbersArray.Add(upgradeRecords.Max(x => x.Mileage));
             }
+            var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            if (odometerRecords.Any())
+            {
+                numbersArray.Add(odometerRecords.Max(x => x.Mileage));
+            }
             return numbersArray.Any() ? numbersArray.Max() : 0;
         }
     }

Controllers/FilesController.cs

@@ -46,12 +46,25 @@ namespace CarCareTracker.Controllers
         }
 
         [HttpPost]
-        public ActionResult DeleteFiles(string fileLocation)
+        public IActionResult DeleteFiles(string fileLocation)
         {
             var result = _fileHelper.DeleteFile(fileLocation);
             return Json(result);
         }
-
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
+        public IActionResult MakeBackup()
+        {
+            var result = _fileHelper.MakeBackup();
+            return Json(result);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpPost]
+        public IActionResult RestoreBackup(string fileName)
+        {
+            var result = _fileHelper.RestoreBackup(fileName);
+            return Json(result);
+        }
         private string UploadFile(IFormFile fileToUpload)
         {
             string uploadDirectory = "temp/";

Controllers/VehicleController.cs

@@ -25,8 +25,10 @@ namespace CarCareTracker.Controllers
         private readonly ITaxRecordDataAccess _taxRecordDataAccess;
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
+        private readonly IPlanRecordDataAccess _planRecordDataAccess;
+        private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
         private readonly IWebHostEnvironment _webEnv;
-        private readonly bool _useDescending;
         private readonly IConfigHelper _config;
         private readonly IFileHelper _fileHelper;
         private readonly IGasHelper _gasHelper;
@@ -47,6 +49,9 @@ namespace CarCareTracker.Controllers
             ITaxRecordDataAccess taxRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            ISupplyRecordDataAccess supplyRecordDataAccess,
+            IPlanRecordDataAccess planRecordDataAccess,
+            IOdometerRecordDataAccess odometerRecordDataAccess,
             IUserLogic userLogic,
             IWebHostEnvironment webEnv,
             IConfigHelper config)
@@ -64,10 +69,12 @@ namespace CarCareTracker.Controllers
             _taxRecordDataAccess = taxRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _supplyRecordDataAccess = supplyRecordDataAccess;
+            _planRecordDataAccess = planRecordDataAccess;
+            _odometerRecordDataAccess = odometerRecordDataAccess;
             _userLogic = userLogic;
             _webEnv = webEnv;
             _config = config;
-            _useDescending = config.GetUserConfig(User).UseDescending;
         }
         private int GetUserID()
         {
@@ -133,11 +140,13 @@ namespace CarCareTracker.Controllers
                 _noteDataAccess.DeleteAllNotesByVehicleId(vehicleId) &&
                 _reminderRecordDataAccess.DeleteAllReminderRecordsByVehicleId(vehicleId) &&
                 _upgradeRecordDataAccess.DeleteAllUpgradeRecordsByVehicleId(vehicleId) &&
+                _planRecordDataAccess.DeleteAllPlanRecordsByVehicleId(vehicleId) &&
+                _supplyRecordDataAccess.DeleteAllSupplyRecordsByVehicleId(vehicleId) &&
                 _userLogic.DeleteAllAccessToVehicle(vehicleId) &&
                 _dataAccess.DeleteVehicle(vehicleId);
             return Json(result);
         }
-        #region "Bulk Imports"
+        #region "Bulk Imports and Exports"
         [HttpGet]
         public IActionResult GetBulkImportModalPartialView(ImportMode mode)
         {
@@ -209,7 +218,53 @@ namespace CarCareTracker.Controllers
                     return Json($"/{fileNameToExport}");
                 }
             }
-            else if (mode == ImportMode.TaxRecord) {
+            else if (mode == ImportMode.OdometerRecord)
+            {
+                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
+                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
+                var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+                if (vehicleRecords.Any())
+                {
+                    var exportData = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Notes = x.Notes, Odometer = x.Mileage.ToString() });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
+            else if (mode == ImportMode.SupplyRecord)
+            {
+                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
+                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
+                var vehicleRecords = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
+                if (vehicleRecords.Any())
+                {
+                    var exportData = vehicleRecords.Select(x => new SupplyRecordExportModel
+                    {
+                        Date = x.Date.ToShortDateString(),
+                        Description = x.Description,
+                        Cost = x.Cost.ToString("C"),
+                        PartNumber = x.PartNumber,
+                        PartQuantity = x.Quantity.ToString(),
+                        PartSupplier = x.PartSupplier,
+                        Notes = x.Notes
+                    });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
+            else if (mode == ImportMode.TaxRecord)
+            {
                 var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
                 var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
@@ -226,6 +281,34 @@ namespace CarCareTracker.Controllers
                     return Json($"/{fileNameToExport}");
                 }
             }
+            else if (mode == ImportMode.PlanRecord)
+            {
+                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
+                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
+                var vehicleRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicleId);
+                if (vehicleRecords.Any())
+                {
+                    var exportData = vehicleRecords.Select(x => new PlanRecordExportModel
+                    {
+                        DateCreated = x.DateCreated.ToString("G"),
+                        DateModified = x.DateModified.ToString("G"),
+                        Description = x.Description,
+                        Cost = x.Cost.ToString("C"),
+                        Type = x.ImportMode.ToString(),
+                        Priority = x.Priority.ToString(),
+                        Progress = x.Progress.ToString(),
+                        Notes = x.Notes
+                    });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
             else if (mode == ImportMode.GasRecord)
             {
                 var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
@@ -235,7 +318,17 @@ namespace CarCareTracker.Controllers
                 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 { Date = x.Date.ToString(), Cost = x.Cost.ToString(), FuelConsumed = x.Gallons.ToString(), FuelEconomy = x.MilesPerGallon.ToString(), Odometer = x.Mileage.ToString() });
+                var exportData = convertedRecords.Select(x => new GasRecordExportModel
+                {
+                    Date = x.Date.ToString(),
+                    Cost = x.Cost.ToString(),
+                    FuelConsumed = x.Gallons.ToString(),
+                    FuelEconomy = x.MilesPerGallon.ToString(),
+                    Odometer = x.Mileage.ToString(),
+                    IsFillToFull = x.IsFillToFull.ToString(),
+                    MissedFuelUp = x.MissedFuelUp.ToString(),
+                    Notes = x.Notes
+                });
                 using (var writer = new StreamWriter(fullExportFilePath))
                 {
                     using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
@@ -270,7 +363,7 @@ namespace CarCareTracker.Controllers
                     config.PrepareHeaderForMatch = args => { return args.Header.Trim().ToLower(); };
                     using (var csv = new CsvReader(reader, config))
                     {
-                        csv.Context.RegisterClassMap<FuellyMapper>();
+                        csv.Context.RegisterClassMap<ImportMapper>();
                         var records = csv.GetRecords<ImportModel>().ToList();
                         if (records.Any())
                         {
@@ -284,7 +377,8 @@ namespace CarCareTracker.Controllers
                                         VehicleId = vehicleId,
                                         Date = DateTime.Parse(importModel.Date),
                                         Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
-                                        Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any)
+                                        Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
+                                        Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes
                                     };
                                     if (string.IsNullOrWhiteSpace(importModel.Cost) && !string.IsNullOrWhiteSpace(importModel.Price))
                                     {
@@ -292,7 +386,8 @@ namespace CarCareTracker.Controllers
                                         //fuelly sometimes exports CSVs without total cost.
                                         var parsedPrice = decimal.Parse(importModel.Price, NumberStyles.Any);
                                         convertedRecord.Cost = convertedRecord.Gallons * parsedPrice;
-                                    } else
+                                    }
+                                    else
                                     {
                                         convertedRecord.Cost = decimal.Parse(importModel.Cost, NumberStyles.Any);
                                     }
@@ -300,14 +395,17 @@ namespace CarCareTracker.Controllers
                                     {
                                         var parsedBool = importModel.PartialFuelUp.Trim() == "1";
                                         convertedRecord.IsFillToFull = !parsedBool;
-                                    } else if (!string.IsNullOrWhiteSpace(importModel.IsFillToFull))
+                                    }
+                                    else if (!string.IsNullOrWhiteSpace(importModel.IsFillToFull))
                                     {
-                                        var parsedBool = importModel.IsFillToFull.Trim() == "1" || importModel.IsFillToFull.Trim() == "Full";
+                                        var possibleFillToFullValues = new List<string> { "1", "true", "full" };
+                                        var parsedBool = possibleFillToFullValues.Contains(importModel.IsFillToFull.Trim().ToLower());
                                         convertedRecord.IsFillToFull = parsedBool;
                                     }
                                     if (!string.IsNullOrWhiteSpace(importModel.MissedFuelUp))
                                     {
-                                        var parsedBool = importModel.MissedFuelUp.Trim() == "1";
+                                        var possibleMissedFuelUpValues = new List<string> { "1", "true" };
+                                        var parsedBool = possibleMissedFuelUpValues.Contains(importModel.MissedFuelUp.Trim().ToLower());
                                         convertedRecord.MissedFuelUp = parsedBool;
                                     }
                                     //insert record into db, check to make sure fuelconsumed is not zero so we don't get a divide by zero error.
@@ -329,6 +427,36 @@ namespace CarCareTracker.Controllers
                                     };
                                     _serviceRecordDataAccess.SaveServiceRecordToVehicle(convertedRecord);
                                 }
+                                else if (mode == ImportMode.OdometerRecord)
+                                {
+                                    var convertedRecord = new OdometerRecord()
+                                    {
+                                        VehicleId = vehicleId,
+                                        Date = DateTime.Parse(importModel.Date),
+                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes
+                                    };
+                                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(convertedRecord);
+                                }
+                                else if (mode == ImportMode.PlanRecord)
+                                {
+                                    var progressIsEnum = Enum.TryParse(importModel.Progress, out PlanProgress parsedProgress);
+                                    var typeIsEnum = Enum.TryParse(importModel.Type, out ImportMode parsedType);
+                                    var priorityIsEnum = Enum.TryParse(importModel.Priority, out PlanPriority parsedPriority);
+                                    var convertedRecord = new PlanRecord()
+                                    {
+                                        VehicleId = vehicleId,
+                                        DateCreated = DateTime.Parse(importModel.DateCreated),
+                                        DateModified = DateTime.Parse(importModel.DateModified),
+                                        Progress = parsedProgress,
+                                        ImportMode = parsedType,
+                                        Priority = parsedPriority,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Plan Record on {importModel.DateCreated}" : importModel.Description,
+                                        Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
+                                        Cost = decimal.Parse(importModel.Cost, NumberStyles.Any)
+                                    };
+                                    _planRecordDataAccess.SavePlanRecordToVehicle(convertedRecord);
+                                }
                                 else if (mode == ImportMode.RepairRecord)
                                 {
                                     var convertedRecord = new CollisionRecord()
@@ -355,6 +483,21 @@ namespace CarCareTracker.Controllers
                                     };
                                     _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(convertedRecord);
                                 }
+                                else if (mode == ImportMode.SupplyRecord)
+                                {
+                                    var convertedRecord = new SupplyRecord()
+                                    {
+                                        VehicleId = vehicleId,
+                                        Date = DateTime.Parse(importModel.Date),
+                                        PartNumber = importModel.PartNumber,
+                                        PartSupplier = importModel.PartSupplier,
+                                        Quantity = decimal.Parse(importModel.PartQuantity, NumberStyles.Any),
+                                        Description = importModel.Description,
+                                        Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
+                                        Notes = importModel.Notes
+                                    };
+                                    _supplyRecordDataAccess.SaveSupplyRecordToVehicle(convertedRecord);
+                                }
                                 else if (mode == ImportMode.TaxRecord)
                                 {
                                     var convertedRecord = new TaxRecord()
@@ -389,10 +532,11 @@ namespace CarCareTracker.Controllers
             //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.
-            bool useMPG = _config.GetUserConfig(User).UseMPG;
-            bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
+            var userConfig = _config.GetUserConfig(User);
+            bool useMPG = userConfig.UseMPG;
+            bool useUKMPG = userConfig.UseUKMPG;
             var computedResults = _gasHelper.GetGasRecordViewModels(result, useMPG, useUKMPG);
-            if (_useDescending)
+            if (userConfig.UseDescending)
             {
                 computedResults = computedResults.OrderByDescending(x => DateTime.Parse(x.Date)).ThenByDescending(x => x.Mileage).ToList();
             }
@@ -430,7 +574,8 @@ namespace CarCareTracker.Controllers
                 Files = result.Files,
                 Gallons = result.Gallons,
                 IsFillToFull = result.IsFillToFull,
-                MissedFuelUp = result.MissedFuelUp
+                MissedFuelUp = result.MissedFuelUp,
+                Notes = result.Notes
             };
             var vehicleIsElectric = _dataAccess.GetVehicleById(convertedResult.VehicleId).IsElectric;
             var viewModel = new GasRecordInputContainer()
@@ -453,6 +598,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetServiceRecordsByVehicleId(int vehicleId)
         {
             var result = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+            bool _useDescending = _config.GetUserConfig(User).UseDescending;
             if (_useDescending)
             {
                 result = result.OrderByDescending(x => x.Date).ThenByDescending(x => x.Mileage).ToList();
@@ -507,6 +653,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetCollisionRecordsByVehicleId(int vehicleId)
         {
             var result = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+            bool _useDescending = _config.GetUserConfig(User).UseDescending;
             if (_useDescending)
             {
                 result = result.OrderByDescending(x => x.Date).ThenByDescending(x => x.Mileage).ToList();
@@ -561,6 +708,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetTaxRecordsByVehicleId(int vehicleId)
         {
             var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            bool _useDescending = _config.GetUserConfig(User).UseDescending;
             if (_useDescending)
             {
                 result = result.OrderByDescending(x => x.Date).ToList();
@@ -634,7 +782,6 @@ namespace CarCareTracker.Controllers
             allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, 0));
             allCosts.AddRange(_reportHelper.GetRepairRecordSum(collisionRecords, 0));
             allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
-            allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
             allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, 0));
             allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, 0));
             viewModel.CostForVehicleByMonth = allCosts.GroupBy(x => new { x.MonthName, x.MonthId }).OrderBy(x => x.Key.MonthId).Select(x => new CostForVehicleByMonth
@@ -669,9 +816,9 @@ namespace CarCareTracker.Controllers
             {
                 numbersArray.Add(upgradeRecords.Min(x => x.Date.Year));
             }
-            var minYear =  numbersArray.Any() ? numbersArray.Min() : DateTime.Now.AddYears(-5).Year;
+            var minYear = numbersArray.Any() ? numbersArray.Min() : DateTime.Now.AddYears(-5).Year;
             var yearDifference = DateTime.Now.Year - minYear + 1;
-            for(int i = 0; i < yearDifference; i++)
+            for (int i = 0; i < yearDifference; i++)
             {
                 viewModel.Years.Add(DateTime.Now.AddYears(i * -1).Year);
             }
@@ -682,10 +829,10 @@ 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 = mileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Average(y=>y.MilesPerGallon)
+                Cost = x.Average(y => y.MilesPerGallon)
             }).ToList();
             viewModel.FuelMileageForVehicleByMonth = monthlyMileageData;
             return PartialView("_Report", viewModel);
@@ -734,7 +881,7 @@ namespace CarCareTracker.Controllers
                 GasRecordSum = gasRecords.Sum(x => x.Cost),
                 CollisionRecordSum = collisionRecords.Sum(x => x.Cost),
                 TaxRecordSum = taxRecords.Sum(x => x.Cost),
-                UpgradeRecordSum = upgradeRecords.Sum(x=>x.Cost)
+                UpgradeRecordSum = upgradeRecords.Sum(x => x.Cost)
             };
             return PartialView("_CostMakeUpReport", viewModel);
         }
@@ -812,7 +959,7 @@ namespace CarCareTracker.Controllers
                 Cost = x.Cost,
                 DataType = ImportMode.TaxRecord
             }));
-            vehicleHistory.VehicleHistory = reportData.OrderBy(x=>x.Date).ThenBy(x=>x.Odometer).ToList();
+            vehicleHistory.VehicleHistory = reportData.OrderBy(x => x.Date).ThenBy(x => x.Odometer).ToList();
             return PartialView("_VehicleHistory", vehicleHistory);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -897,6 +1044,11 @@ namespace CarCareTracker.Controllers
             {
                 numbersArray.Add(upgradeRecords.Max(x => x.Mileage));
             }
+            var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            if (odometerRecords.Any())
+            {
+                numbersArray.Add(odometerRecords.Max(x => x.Mileage));
+            }
             return numbersArray.Any() ? numbersArray.Max() : 0;
         }
         private List<ReminderRecordViewModel> GetRemindersAndUrgency(int vehicleId, DateTime dateCompare)
@@ -911,7 +1063,37 @@ namespace CarCareTracker.Controllers
         public IActionResult GetVehicleHaveUrgentOrPastDueReminders(int vehicleId)
         {
             var result = GetRemindersAndUrgency(vehicleId, DateTime.Now);
-            if (result.Where(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue).Any())
+            //check for past due reminders that are eligible for recurring.
+            var pastDueAndRecurring = result.Where(x => x.Urgency == ReminderUrgency.PastDue && x.IsRecurring);
+            if (pastDueAndRecurring.Any())
+            {
+                foreach (ReminderRecordViewModel reminderRecord in pastDueAndRecurring)
+                {
+                    //update based on recurring intervals.
+                    //pull reminderRecord based on ID
+                    var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(reminderRecord.Id);
+                    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);
+                    }
+                    //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.
+            var pastDueAndUrgentReminders = result.Where(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue);
+            if (pastDueAndUrgentReminders.Any())
             {
                 return Json(true);
             }
@@ -956,7 +1138,10 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Mileage = result.Mileage,
-                Metric = result.Metric
+                Metric = result.Metric,
+                IsRecurring = result.IsRecurring,
+                ReminderMileageInterval = result.ReminderMileageInterval,
+                ReminderMonthInterval = result.ReminderMonthInterval
             };
             return PartialView("_ReminderRecordModal", convertedResult);
         }
@@ -973,6 +1158,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetUpgradeRecordsByVehicleId(int vehicleId)
         {
             var result = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+            bool _useDescending = _config.GetUserConfig(User).UseDescending;
             if (_useDescending)
             {
                 result = result.OrderByDescending(x => x.Date).ThenByDescending(x => x.Mileage).ToList();
@@ -1053,5 +1239,225 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         #endregion
+        #region "Supply Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
+        {
+            var result = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
+            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("_SupplyRecords", result);
+        }
+        [HttpPost]
+        public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
+        {
+            //move files from temp.
+            supplyRecord.Files = supplyRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            var result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(supplyRecord.ToSupplyRecord());
+            return Json(result);
+        }
+        [HttpGet]
+        public IActionResult GetAddSupplyRecordPartialView()
+        {
+            return PartialView("_SupplyRecordModal", new SupplyRecordInput());
+        }
+        [HttpGet]
+        public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
+        {
+            var result = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
+            //convert to Input object.
+            var convertedResult = new SupplyRecordInput
+            {
+                Id = result.Id,
+                Cost = result.Cost,
+                Date = result.Date.ToShortDateString(),
+                Description = result.Description,
+                PartNumber = result.PartNumber,
+                Quantity = result.Quantity,
+                PartSupplier = result.PartSupplier,
+                Notes = result.Notes,
+                VehicleId = result.VehicleId,
+                Files = result.Files
+            };
+            return PartialView("_SupplyRecordModal", convertedResult);
+        }
+        [HttpPost]
+        public IActionResult DeleteSupplyRecordById(int supplyRecordId)
+        {
+            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(supplyRecordId);
+            return Json(result);
+        }
+        #endregion
+        #region "Plan Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetPlanRecordsByVehicleId(int vehicleId)
+        {
+            var result = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicleId);
+            return PartialView("_PlanRecords", result);
+        }
+        [HttpPost]
+        public IActionResult SavePlanRecordToVehicleId(PlanRecordInput planRecord)
+        {
+            //populate createdDate
+            if (planRecord.Id == default)
+            {
+                planRecord.DateCreated = DateTime.Now.ToString("G");
+            }
+            planRecord.DateModified = DateTime.Now.ToString("G");
+            //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());
+            return Json(result);
+        }
+        [HttpGet]
+        public IActionResult GetAddPlanRecordPartialView()
+        {
+            return PartialView("_PlanRecordModal", new PlanRecordInput());
+        }
+        [HttpPost]
+        public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
+        {
+            var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
+            existingRecord.Progress = planProgress;
+            existingRecord.DateModified = DateTime.Now;
+            var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
+            if (planProgress == PlanProgress.Done)
+            {
+                //convert plan record to service/upgrade/repair record.
+                if (existingRecord.ImportMode == ImportMode.ServiceRecord)
+                {
+                    var newRecord = new ServiceRecord()
+                    {
+                        VehicleId = existingRecord.VehicleId,
+                        Date = DateTime.Now,
+                        Mileage = odometer,
+                        Description = existingRecord.Description,
+                        Cost = existingRecord.Cost,
+                        Notes = existingRecord.Notes,
+                        Files = existingRecord.Files
+                    };
+                    _serviceRecordDataAccess.SaveServiceRecordToVehicle(newRecord);
+                }
+                else if (existingRecord.ImportMode == ImportMode.RepairRecord)
+                {
+                    var newRecord = new CollisionRecord()
+                    {
+                        VehicleId = existingRecord.VehicleId,
+                        Date = DateTime.Now,
+                        Mileage = odometer,
+                        Description = existingRecord.Description,
+                        Cost = existingRecord.Cost,
+                        Notes = existingRecord.Notes,
+                        Files = existingRecord.Files
+                    };
+                    _collisionRecordDataAccess.SaveCollisionRecordToVehicle(newRecord);
+                }
+                else if (existingRecord.ImportMode == ImportMode.UpgradeRecord)
+                {
+                    var newRecord = new UpgradeRecord()
+                    {
+                        VehicleId = existingRecord.VehicleId,
+                        Date = DateTime.Now,
+                        Mileage = odometer,
+                        Description = existingRecord.Description,
+                        Cost = existingRecord.Cost,
+                        Notes = existingRecord.Notes,
+                        Files = existingRecord.Files
+                    };
+                    _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(newRecord);
+                }
+            }
+            return Json(result);
+        }
+        [HttpGet]
+        public IActionResult GetPlanRecordForEditById(int planRecordId)
+        {
+            var result = _planRecordDataAccess.GetPlanRecordById(planRecordId);
+            //convert to Input object.
+            var convertedResult = new PlanRecordInput
+            {
+                Id = result.Id,
+                Description = result.Description,
+                DateCreated = result.DateCreated.ToString("G"),
+                DateModified = result.DateModified.ToString("G"),
+                ImportMode = result.ImportMode,
+                Priority = result.Priority,
+                Progress = result.Progress,
+                Cost = result.Cost,
+                Notes = result.Notes,
+                VehicleId = result.VehicleId,
+                Files = result.Files
+            };
+            return PartialView("_PlanRecordModal", convertedResult);
+        }
+        [HttpPost]
+        public IActionResult DeletePlanRecordById(int planRecordId)
+        {
+            var result = _planRecordDataAccess.DeletePlanRecordById(planRecordId);
+            return Json(result);
+        }
+        #endregion
+        #region "Odometer Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetOdometerRecordsByVehicleId(int vehicleId)
+        {
+            var result = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            bool _useDescending = _config.GetUserConfig(User).UseDescending;
+            if (_useDescending)
+            {
+                result = result.OrderByDescending(x => x.Date).ThenByDescending(x => x.Mileage).ToList();
+            }
+            else
+            {
+                result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
+            }
+            return PartialView("_OdometerRecords", result);
+        }
+        [HttpPost]
+        public IActionResult SaveOdometerRecordToVehicleId(OdometerRecordInput odometerRecord)
+        {
+            //move files from temp.
+            odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord.ToOdometerRecord());
+            return Json(result);
+        }
+        [HttpGet]
+        public IActionResult GetAddOdometerRecordPartialView()
+        {
+            return PartialView("_OdometerRecordModal", new OdometerRecordInput());
+        }
+        [HttpGet]
+        public IActionResult GetOdometerRecordForEditById(int odometerRecordId)
+        {
+            var result = _odometerRecordDataAccess.GetOdometerRecordById(odometerRecordId);
+            //convert to Input object.
+            var convertedResult = new OdometerRecordInput
+            {
+                Id = result.Id,
+                Date = result.Date.ToShortDateString(),
+                Mileage = result.Mileage,
+                Notes = result.Notes,
+                VehicleId = result.VehicleId,
+                Files = result.Files
+            };
+            return PartialView("_OdometerRecordModal", convertedResult);
+        }
+        [HttpPost]
+        public IActionResult DeleteOdometerRecordById(int odometerRecordId)
+        {
+            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(odometerRecordId);
+            return Json(result);
+        }
+        #endregion
     }
 }

Dockerfile

@@ -1,9 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /App
 
 COPY . ./
-RUN dotnet restore
-RUN dotnet publish -c Release -o out
+ARG TARGETARCH
+RUN dotnet restore -a $TARGETARCH
+RUN dotnet publish -a $TARGETARCH -c Release -o out
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /App

Enum/ImportMode.cs

@@ -6,6 +6,12 @@
         RepairRecord = 1,
         GasRecord = 2,
         TaxRecord = 3,
-        UpgradeRecord = 4
+        UpgradeRecord = 4,
+        ReminderRecord = 5,
+        NoteRecord = 6,
+        SupplyRecord = 7,
+        Dashboard = 8,
+        PlanRecord = 9,
+        OdometerRecord = 10
     }
 }

Enum/PlanPriority.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public enum PlanPriority
+    {
+        Critical = 0,
+        Normal = 1,
+        Low = 2
+    }
+}

Enum/PlanProgress.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public enum PlanProgress
+    {
+        Backlog = 0,
+        InProgress = 1,
+        Testing = 2,
+        Done = 3
+    }
+}

Enum/ReminderMileageInterval.cs

@@ -0,0 +1,13 @@
+namespace CarCareTracker.Models
+{
+    public enum ReminderMileageInterval
+    {
+        FiveHundredMiles = 500,
+        OneThousandMiles = 1000,
+        ThreeThousandMiles = 3000,
+        FiveThousandMiles = 5000,
+        SevenThousandFiveHundredMiles = 7500,
+        TenThousandMiles = 10000,
+        FiftyThousandMiles = 50000
+    }
+}

Enum/ReminderMonthInterval.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public enum ReminderMonthInterval
+    {
+        ThreeMonths = 3,
+        SixMonths = 6,
+        OneYear = 12,
+        FiveYears = 60
+    }
+}

External/Implementations/OdometerRecordDataAccess.cs

@@ -0,0 +1,57 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class OdometerRecordDataAccess : IOdometerRecordDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "odometerrecords";
+        public List<OdometerRecord> GetOdometerRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<OdometerRecord>(tableName);
+                var odometerRecords = table.Find(Query.EQ(nameof(OdometerRecord.VehicleId), vehicleId));
+                return odometerRecords.ToList() ?? new List<OdometerRecord>();
+            };
+        }
+        public OdometerRecord GetOdometerRecordById(int odometerRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<OdometerRecord>(tableName);
+                return table.FindById(odometerRecordId);
+            };
+        }
+        public bool DeleteOdometerRecordById(int odometerRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<OdometerRecord>(tableName);
+                table.Delete(odometerRecordId);
+                return true;
+            };
+        }
+        public bool SaveOdometerRecordToVehicle(OdometerRecord odometerRecord)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<OdometerRecord>(tableName);
+                table.Upsert(odometerRecord);
+                return true;
+            };
+        }
+        public bool DeleteAllOdometerRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<OdometerRecord>(tableName);
+                var odometerRecords = table.DeleteMany(Query.EQ(nameof(OdometerRecord.VehicleId), vehicleId));
+                return true;
+            };
+        }
+    }
+}

External/Implementations/PlanRecordDataAccess.cs

@@ -0,0 +1,57 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PlanRecordDataAccess : IPlanRecordDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "planrecords";
+        public List<PlanRecord> GetPlanRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<PlanRecord>(tableName);
+                var planRecords = table.Find(Query.EQ(nameof(PlanRecord.VehicleId), vehicleId));
+                return planRecords.ToList() ?? new List<PlanRecord>();
+            };
+        }
+        public PlanRecord GetPlanRecordById(int planRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<PlanRecord>(tableName);
+                return table.FindById(planRecordId);
+            };
+        }
+        public bool DeletePlanRecordById(int planRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<PlanRecord>(tableName);
+                table.Delete(planRecordId);
+                return true;
+            };
+        }
+        public bool SavePlanRecordToVehicle(PlanRecord planRecord)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<PlanRecord>(tableName);
+                table.Upsert(planRecord);
+                return true;
+            };
+        }
+        public bool DeleteAllPlanRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<PlanRecord>(tableName);
+                var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecord.VehicleId), vehicleId));
+                return true;
+            };
+        }
+    }
+}

External/Implementations/SupplyRecordDataAccess.cs

@@ -0,0 +1,57 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class SupplyRecordDataAccess : ISupplyRecordDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "supplyrecords";
+        public List<SupplyRecord> GetSupplyRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                var supplyRecords = table.Find(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+                return supplyRecords.ToList() ?? new List<SupplyRecord>();
+            };
+        }
+        public SupplyRecord GetSupplyRecordById(int supplyRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                return table.FindById(supplyRecordId);
+            };
+        }
+        public bool DeleteSupplyRecordById(int supplyRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                table.Delete(supplyRecordId);
+                return true;
+            };
+        }
+        public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                table.Upsert(supplyRecord);
+                return true;
+            };
+        }
+        public bool DeleteAllSupplyRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                var supplyRecords = table.DeleteMany(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+                return true;
+            };
+        }
+    }
+}

External/Interfaces/IOdometerRecordDataAccess.cs

@@ -0,0 +1,13 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IOdometerRecordDataAccess
+    {
+        public List<OdometerRecord> GetOdometerRecordsByVehicleId(int vehicleId);
+        public OdometerRecord GetOdometerRecordById(int odometerRecordId);
+        public bool DeleteOdometerRecordById(int odometerRecordId);
+        public bool SaveOdometerRecordToVehicle(OdometerRecord odometerRecord);
+        public bool DeleteAllOdometerRecordsByVehicleId(int vehicleId);
+    }
+}

External/Interfaces/IPlanRecordDataAccess.cs

@@ -0,0 +1,13 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IPlanRecordDataAccess
+    {
+        public List<PlanRecord> GetPlanRecordsByVehicleId(int vehicleId);
+        public PlanRecord GetPlanRecordById(int planRecordId);
+        public bool DeletePlanRecordById(int planRecordId);
+        public bool SavePlanRecordToVehicle(PlanRecord planRecord);
+        public bool DeleteAllPlanRecordsByVehicleId(int vehicleId);
+    }
+}

External/Interfaces/ISupplyRecordDataAccess.cs

@@ -0,0 +1,13 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface ISupplyRecordDataAccess
+    {
+        public List<SupplyRecord> GetSupplyRecordsByVehicleId(int vehicleId);
+        public SupplyRecord GetSupplyRecordById(int supplyRecordId);
+        public bool DeleteSupplyRecordById(int supplyRecordId);
+        public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord);
+        public bool DeleteAllSupplyRecordsByVehicleId(int vehicleId);
+    }
+}

Helper/ConfigHelper.cs

@@ -93,7 +93,10 @@ namespace CarCareTracker.Helper
                 UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
                 EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
                 HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
-                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)])
+                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
+                UseThreeDecimalGasCost = bool.Parse(_config[nameof(UserConfig.UseThreeDecimalGasCost)]),
+                VisibleTabs = _config.GetSection("VisibleTabs").Get<List<ImportMode>>(),
+                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
             };
             int userId = 0;
             if (user != null)

Helper/FileHelper.cs

@@ -1,17 +1,23 @@
-namespace CarCareTracker.Helper
+using System.IO.Compression;
+
+namespace CarCareTracker.Helper
 {
     public interface IFileHelper
     {
         string GetFullFilePath(string currentFilePath, bool mustExist = true);
         string MoveFileFromTemp(string currentFilePath, string newFolder);
         bool DeleteFile(string currentFilePath);
+        string MakeBackup();
+        bool RestoreBackup(string fileName);
     }
-    public class FileHelper: IFileHelper
+    public class FileHelper : IFileHelper
     {
         private readonly IWebHostEnvironment _webEnv;
-        public FileHelper(IWebHostEnvironment webEnv)
+        private readonly ILogger<IFileHelper> _logger;
+        public FileHelper(IWebHostEnvironment webEnv, ILogger<IFileHelper> logger)
         {
             _webEnv = webEnv;
+            _logger = logger;
         }
         public string GetFullFilePath(string currentFilePath, bool mustExist = true)
         {
@@ -23,7 +29,8 @@
             if (File.Exists(oldFilePath))
             {
                 return oldFilePath;
-            } else if (!mustExist)
+            }
+            else if (!mustExist)
             {
                 return oldFilePath;
             }
@@ -31,6 +38,122 @@
                 return string.Empty;
             }
         }
+        public bool RestoreBackup(string fileName)
+        {
+            var fullFilePath = GetFullFilePath(fileName);
+            if (string.IsNullOrWhiteSpace(fullFilePath))
+            {
+                return false;
+            }
+            try
+            {
+                var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{Guid.NewGuid()}");
+                if (!Directory.Exists(tempPath))
+                    Directory.CreateDirectory(tempPath);
+                //extract zip file
+                ZipFile.ExtractToDirectory(fullFilePath, tempPath);
+                //copy over images and documents.
+                var imagePath = Path.Combine(tempPath, "images");
+                var documentPath = Path.Combine(tempPath, "documents");
+                var dataPath = Path.Combine(tempPath, StaticHelper.DbName);
+                var configPath = Path.Combine(tempPath, StaticHelper.UserConfigPath);
+                if (Directory.Exists(imagePath))
+                {
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "images");
+                    if (!Directory.Exists(existingPath))
+                    {
+                        Directory.CreateDirectory(existingPath);
+                    }
+                    //copy each files from temp folder to newPath
+                    var filesToUpload = Directory.GetFiles(imagePath);
+                    foreach(string file in filesToUpload)
+                    {
+                        File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}", true);
+                    }
+                }
+                if (Directory.Exists(documentPath))
+                {
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "documents");
+                    if (!Directory.Exists(existingPath))
+                    {
+                        Directory.CreateDirectory(existingPath);
+                    }
+                    //copy each files from temp folder to newPath
+                    var filesToUpload = Directory.GetFiles(documentPath);
+                    foreach (string file in filesToUpload)
+                    {
+                        File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}", true);
+                    }
+                }
+                if (File.Exists(dataPath))
+                {
+                    //data path will always exist as it is created on startup if not.
+                    File.Move(dataPath, StaticHelper.DbName, true);
+                }
+                if (File.Exists(configPath))
+                {
+                    //check if config folder exists.
+                    if (!Directory.Exists("config/"))
+                    {
+                        Directory.CreateDirectory("config/");
+                    }
+                    File.Move(configPath, StaticHelper.UserConfigPath, true);
+                }
+                return true;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex, $"Error Restoring Database Backup: {ex.Message}");
+                return false;
+            }
+        }
+        public string MakeBackup()
+        {
+            var folderName = $"db_backup_{DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}";
+            var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{folderName}");
+            var imagePath = Path.Combine(_webEnv.WebRootPath, "images");
+            var documentPath = Path.Combine(_webEnv.WebRootPath, "documents");
+            var dataPath = StaticHelper.DbName;
+            var configPath = StaticHelper.UserConfigPath;
+            if (!Directory.Exists(tempPath))
+                Directory.CreateDirectory(tempPath);
+            if (Directory.Exists(imagePath))
+            {
+                var files = Directory.GetFiles(imagePath);
+                foreach (var file in files)
+                {
+                    var newPath = Path.Combine(tempPath, "images");
+                    Directory.CreateDirectory(newPath);
+                    File.Copy(file, $"{newPath}/{Path.GetFileName(file)}");
+                }
+            }
+            if (Directory.Exists(documentPath))
+            {
+                var files = Directory.GetFiles(documentPath);
+                foreach (var file in files)
+                {
+                    var newPath = Path.Combine(tempPath, "documents");
+                    Directory.CreateDirectory(newPath);
+                    File.Copy(file, $"{newPath}/{Path.GetFileName(file)}");
+                }
+            }
+            if (File.Exists(dataPath))
+            {
+                var newPath = Path.Combine(tempPath, "data");
+                Directory.CreateDirectory(newPath);
+                File.Copy(dataPath, $"{newPath}/{Path.GetFileName(dataPath)}");
+            }
+            if (File.Exists(configPath))
+            {
+                var newPath = Path.Combine(tempPath, "config");
+                Directory.CreateDirectory(newPath);
+                File.Copy(configPath, $"{newPath}/{Path.GetFileName(configPath)}");
+            }
+            var destFilePath = $"{tempPath}.zip";
+            ZipFile.CreateFromDirectory(tempPath, destFilePath);
+            //delete temp directory
+            Directory.Delete(tempPath, true);
+            return $"/temp/{folderName}.zip";
+        }
         public string MoveFileFromTemp(string currentFilePath, string newFolder)
         {
             string tempPath = "temp/";
@@ -38,7 +161,8 @@
             {
                 return currentFilePath;
             }
-            if (currentFilePath.StartsWith("/")) { 
+            if (currentFilePath.StartsWith("/"))
+            {
                 currentFilePath = currentFilePath.Substring(1);
             }
             string uploadPath = Path.Combine(_webEnv.WebRootPath, newFolder);
@@ -67,7 +191,8 @@
             if (!File.Exists(filePath)) //verify file no longer exists.
             {
                 return true;
-            } else
+            }
+            else
             {
                 return false;
             }

Helper/GasHelper.cs

@@ -42,7 +42,10 @@ namespace CarCareTracker.Helper
                         Gallons = convertedConsumption,
                         Cost = currentObject.Cost,
                         DeltaMileage = deltaMileage,
-                        CostPerGallon = currentObject.Cost / convertedConsumption
+                        CostPerGallon = convertedConsumption > 0.00M ? currentObject.Cost / convertedConsumption : 0,
+                        IsFillToFull = currentObject.IsFillToFull,
+                        MissedFuelUp = currentObject.MissedFuelUp,
+                        Notes = currentObject.Notes
                     };
                     if (currentObject.MissedFuelUp)
                     {
@@ -55,7 +58,10 @@ namespace CarCareTracker.Helper
                     else if (currentObject.IsFillToFull)
                     {
                         //if user filled to full.
-                        gasRecordViewModel.MilesPerGallon = useMPG ? (unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption) : 100 / ((unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption));
+                        if (convertedConsumption > 0.00M)
+                        {
+                            gasRecordViewModel.MilesPerGallon = useMPG ? (unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption) : 100 / ((unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption));
+                        }
                         //reset unFactored vars
                         unFactoredConsumption = 0;
                         unFactoredMileage = 0;
@@ -81,7 +87,10 @@ namespace CarCareTracker.Helper
                         Cost = currentObject.Cost,
                         DeltaMileage = 0,
                         MilesPerGallon = 0,
-                        CostPerGallon = currentObject.Cost / convertedConsumption
+                        CostPerGallon = convertedConsumption > 0.00M ? currentObject.Cost / convertedConsumption : 0,
+                        IsFillToFull = currentObject.IsFillToFull,
+                        MissedFuelUp = currentObject.MissedFuelUp,
+                        Notes = currentObject.Notes
                     });
                 }
                 previousMileage = currentObject.Mileage;

Helper/ReminderHelper.cs

@@ -21,7 +21,8 @@ namespace CarCareTracker.Helper
                     Mileage = reminder.Mileage,
                     Description = reminder.Description,
                     Notes = reminder.Notes,
-                    Metric = reminder.Metric
+                    Metric = reminder.Metric,
+                    IsRecurring = reminder.IsRecurring
                 };
                 if (reminder.Metric == ReminderMetric.Both)
                 {

Helper/StaticHelper.cs

@@ -1,4 +1,6 @@
-namespace CarCareTracker.Helper
+using CarCareTracker.Models;
+
+namespace CarCareTracker.Helper
 {
     /// <summary>
     /// helper method for static vars
@@ -18,10 +20,48 @@
             if (input.Length > maxLength)
             {
                 return (input.Substring(0, maxLength) + "...");
-            } else
+            }
+            else
             {
                 return input;
             }
         }
+        public static string DefaultActiveTab(UserConfig userConfig, ImportMode tab)
+        {
+            var defaultTab = userConfig.DefaultTab;
+            var visibleTabs = userConfig.VisibleTabs;
+            if (visibleTabs.Contains(tab) && tab == defaultTab)
+            {
+                return "active";
+            }
+            else if (!visibleTabs.Contains(tab))
+            {
+                return "d-none";
+            }
+            return "";
+        }
+        public static string DefaultActiveTabContent(UserConfig userConfig, ImportMode tab)
+        {
+            var defaultTab = userConfig.DefaultTab;
+            if (tab == defaultTab)
+            {
+                return "show active";
+            }
+            return "";
+        }
+        public static string DefaultTabSelected(UserConfig userConfig, ImportMode tab)
+        {
+            var defaultTab = userConfig.DefaultTab;
+            var visibleTabs = userConfig.VisibleTabs;
+            if (!visibleTabs.Contains(tab))
+            {
+                return "disabled";
+            }
+            else if (tab == defaultTab)
+            {
+                return "selected";
+            }
+            return "";
+        }
     }
 }

LICENSE

@@ -1,8 +1,7 @@
-LubeLogger by Hargata Softworks is licensed under the MIT License individual
-personal use. Commercial users and/or corporate entities are required 
-to pay either a one time fee or maintain an active subscription in order to
-continue using LubeLogger. For pricing information please contact us at
-hargatasoftworks@gmail.com
+LubeLogger by Hargata Softworks is licensed under the MIT License for individual
+and personal use. Commercial users and/or corporate entities are required 
+to maintain an active subscription in order to continue using LubeLogger. 
+For pricing information please contact us at hargatasoftworks@gmail.com
 
 MIT License
 

MapProfile/ImportMappers.cs

@@ -3,11 +3,13 @@ using CsvHelper.Configuration;
 
 namespace CarCareTracker.MapProfile
 {
-    public class FuellyMapper: ClassMap<ImportModel>
+    public class ImportMapper: ClassMap<ImportModel>
     {
-        public FuellyMapper()
+        public ImportMapper()
         {
             Map(m => m.Date).Name(["date", "fuelup_date"]);
+            Map(m => m.DateCreated).Name(["datecreated"]);
+            Map(m => m.DateModified).Name(["datemodified"]);
             Map(m => m.Odometer).Name(["odometer"]);
             Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed"]);
             Map(m => m.Cost).Name(["cost", "total cost", "totalcost", "total price"]);
@@ -16,7 +18,13 @@ namespace CarCareTracker.MapProfile
             Map(m => m.PartialFuelUp).Name(["partial_fuelup"]);
             Map(m => m.IsFillToFull).Name(["isfilltofull", "filled up"]);
             Map(m => m.Description).Name(["description"]);
-            Map(m => m.MissedFuelUp).Name(["missed_fuelup"]);
+            Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup"]);
+            Map(m => m.PartSupplier).Name(["partsupplier"]);
+            Map(m => m.PartQuantity).Name(["partquantity"]);
+            Map(m => m.PartNumber).Name(["partnumber"]);
+            Map(m => m.Progress).Name(["progress"]);
+            Map(m => m.Type).Name(["type"]);
+            Map(m => m.Priority).Name(["priority"]);
         }
     }
 }

Middleware/Authen.cs

@@ -160,5 +160,18 @@ namespace CarCareTracker.Middleware
             Response.Redirect("/Login/Index");
             return Task.CompletedTask;
         }
+        protected override Task HandleForbiddenAsync(AuthenticationProperties properties)
+        {
+            if (Request.RouteValues.TryGetValue("controller", out object value))
+            {
+                if (value.ToString().ToLower() == "api")
+                {
+                    Response.StatusCode = 403;
+                    return Task.CompletedTask;
+                }
+            }
+            Response.Redirect("/Error/401");
+            return Task.CompletedTask;
+        }
     }
 }

Models/Collision/CollisionRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }

Models/GasRecord/GasRecord.cs

@@ -16,6 +16,7 @@
         public decimal Cost { get; set; }
         public bool IsFillToFull { get; set; } = true;
         public bool MissedFuelUp { get; set; } = false;
+        public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/GasRecord/GasRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         /// <summary>
         /// American moment
         /// </summary>
@@ -16,6 +16,7 @@
         public decimal Cost { get; set; }
         public bool IsFillToFull { get; set; } = true;
         public bool MissedFuelUp { get; set; } = false;
+        public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public GasRecord ToGasRecord() { return new GasRecord { 
             Id = Id, 
@@ -26,7 +27,8 @@
             VehicleId = VehicleId, 
             Files = Files,
             IsFillToFull = IsFillToFull,
-            MissedFuelUp = MissedFuelUp
+            MissedFuelUp = MissedFuelUp,
+            Notes = Notes
         }; }
     }
 }

Models/GasRecord/GasRecordViewModel.cs

@@ -18,5 +18,8 @@
         public int DeltaMileage { get; set; }
         public decimal MilesPerGallon { get; set; }
         public decimal CostPerGallon { get; set; }
+        public bool IsFillToFull { get; set; }
+        public bool MissedFuelUp { get; set; }
+        public string Notes { get; set; }
     }
 }

Models/ImportModel.cs

@@ -6,6 +6,11 @@
     public class ImportModel
     {
         public string Date { get; set; }
+        public string DateCreated { get; set; }
+        public string DateModified { get; set; }
+        public string Type { get; set; }
+        public string Priority { get; set; }
+        public string Progress { get; set; }
         public string Odometer { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
@@ -15,6 +20,20 @@
         public string PartialFuelUp { get; set; }
         public string IsFillToFull { get; set; }
         public string MissedFuelUp { get; set; }
+        public string PartNumber { get; set; }
+        public string PartSupplier { get; set; }
+        public string PartQuantity { get; set; }
+    }
+
+    public class SupplyRecordExportModel
+    {
+        public string Date { get; set; }
+        public string PartNumber { get; set; }
+        public string PartSupplier { get; set; }
+        public string PartQuantity { get; set; }
+        public string Description { get; set; }
+        public string Cost { get; set; }
+        public string Notes { get; set; }
     }
 
     public class ServiceRecordExportModel
@@ -25,6 +44,12 @@
         public string Notes { get; set; }
         public string Cost { get; set; }
     }
+    public class OdometerRecordExportModel
+    {
+        public string Date { get; set; }
+        public string Odometer { get; set; }
+        public string Notes { get; set; }
+    }
     public class TaxRecordExportModel
     {
         public string Date { get; set; }
@@ -40,6 +65,9 @@
         public string FuelConsumed { get; set; }
         public string Cost { get; set; }
         public string FuelEconomy { get; set; }
+        public string IsFillToFull { get; set; }
+        public string MissedFuelUp { get; set; }
+        public string Notes { get; set; }
     }
     public class ReminderExportModel
     {
@@ -48,4 +76,16 @@
         public string Metric { get; set; }
         public string Notes { get; set; }
     }
+    public class PlanRecordExportModel 
+    {
+        public string DateCreated { get; set; }
+        public string DateModified { get; set; }
+        public string Description { get; set; }
+        public string Notes { get; set; }
+        public string Type { get; set; }
+        public string Priority { get; set; }
+        public string Progress { get; set; }
+        public string Cost { get; set; }
+    }
+
 }

Models/OdometerRecord/OdometerRecord.cs

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

Models/OdometerRecord/OdometerRecordInput.cs

@@ -0,0 +1,13 @@
+namespace CarCareTracker.Models
+{
+    public class OdometerRecordInput
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
+        public int Mileage { get; set; }
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files }; }
+    }
+}

Models/PlanRecord/PlanCostItem.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class PlanCostItem
+    {
+        public string CostName { get; set; }
+        public decimal CostAmount { get; set; }
+    }
+}

Models/PlanRecord/PlanRecord.cs

@@ -0,0 +1,17 @@
+namespace CarCareTracker.Models
+{
+    public class PlanRecord
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        public DateTime DateCreated { get; set; }
+        public DateTime DateModified { get; set; }
+        public string Description { get; set; }
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public ImportMode ImportMode { get; set; }
+        public PlanPriority Priority { get; set; }
+        public PlanProgress Progress { get; set; }
+        public decimal Cost { get; set; }
+    }
+}

Models/PlanRecord/PlanRecordInput.cs

@@ -0,0 +1,30 @@
+namespace CarCareTracker.Models
+{
+    public class PlanRecordInput
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        public string DateCreated { get; set; } = DateTime.Now.ToShortDateString();
+        public string DateModified { get; set; } = DateTime.Now.ToShortDateString();
+        public string Description { get; set; }
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public ImportMode ImportMode { get; set; }
+        public PlanPriority Priority { get; set; }
+        public PlanProgress Progress { get; set; }
+        public decimal Cost { get; set; }
+        public PlanRecord ToPlanRecord() { return new PlanRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            DateCreated = DateTime.Parse(DateCreated), 
+            DateModified = DateTime.Parse(DateModified),
+            Description = Description, 
+            Notes = Notes, 
+            Files = Files,
+            ImportMode = ImportMode,
+            Cost = Cost,
+            Priority = Priority,
+            Progress = Progress
+        }; }
+    }
+}

Models/Reminder/ReminderRecord.cs

@@ -8,6 +8,9 @@
         public int Mileage { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
+        public bool IsRecurring { get; set; } = false;
+        public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
+        public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
     }
 }

Models/Reminder/ReminderRecordInput.cs

@@ -8,6 +8,9 @@
         public int Mileage { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
+        public bool IsRecurring { get; set; } = false;
+        public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
+        public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
         public ReminderRecord ToReminderRecord() { return new ReminderRecord { 
             Id = Id, 
@@ -16,6 +19,9 @@
             Mileage = Mileage, 
             Description = Description, 
             Metric = Metric,
+            IsRecurring = IsRecurring,
+            ReminderMileageInterval = ReminderMileageInterval,
+            ReminderMonthInterval = ReminderMonthInterval,
             Notes = Notes }; }
     }
 }

Models/Reminder/ReminderRecordViewModel.cs

@@ -13,5 +13,9 @@
         /// </summary>
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
         public ReminderUrgency Urgency { get; set; } = ReminderUrgency.NotUrgent;
+        /// <summary>
+        /// Recurring Reminders
+        /// </summary>
+        public bool IsRecurring { get; set; } = false;
     }
 }

Models/ServiceRecord/ServiceRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }

Models/Supply/SupplyRecord.cs

@@ -0,0 +1,37 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyRecord
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        /// <summary>
+        /// When the part or supplies were purchased.
+        /// </summary>
+        public DateTime Date { get; set; }
+        /// <summary>
+        /// Part number can be alphanumeric.
+        /// </summary>
+        public string PartNumber { get; set; }
+        /// <summary>
+        /// Where the part/supplies were purchased from.
+        /// </summary>
+        public string PartSupplier { get; set; }
+        /// <summary>
+        /// Amount purchased, can be partial quantities such as fluids.
+        /// </summary>
+        public decimal Quantity { get; set; }
+        /// <summary>
+        /// Description of the part/supplies purchased.
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// How much it costs
+        /// </summary>
+        public decimal Cost { get; set; }
+        /// <summary>
+        /// Additional notes.
+        /// </summary>
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+    }
+}

Models/Supply/SupplyRecordInput.cs

@@ -0,0 +1,27 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyRecordInput
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
+        public string PartNumber { get; set; }
+        public string PartSupplier { get; set; }
+        public decimal Quantity { 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>();
+        public SupplyRecord ToSupplyRecord() { return new SupplyRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            Date = DateTime.Parse(Date), 
+            Cost = Cost, 
+            PartNumber = PartNumber,
+            PartSupplier = PartSupplier,
+            Quantity = Quantity,
+            Description = Description, 
+            Notes = Notes, 
+            Files = Files }; }
+    }
+}

Models/TaxRecord/TaxRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }

Models/UserConfig.cs

@@ -9,7 +9,18 @@
         public bool EnableAuth { get; set; }
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
+        public bool UseThreeDecimalGasCost { get; set; }
         public string UserNameHash { get; set; }
         public string UserPasswordHash { get; set;}
+        public List<ImportMode> VisibleTabs { get; set; } = new List<ImportMode>() { 
+            ImportMode.Dashboard,
+            ImportMode.ServiceRecord, 
+            ImportMode.RepairRecord, 
+            ImportMode.GasRecord, 
+            ImportMode.UpgradeRecord, 
+            ImportMode.TaxRecord, 
+            ImportMode.ReminderRecord, 
+            ImportMode.NoteRecord};
+        public ImportMode DefaultTab { get; set; } = ImportMode.Dashboard;
     }
 }

Program.cs

@@ -22,6 +22,9 @@ builder.Services.AddSingleton<IUserRecordDataAccess, UserRecordDataAccess>();
 builder.Services.AddSingleton<ITokenRecordDataAccess, TokenRecordDataAccess>();
 builder.Services.AddSingleton<IUserAccessDataAccess, UserAccessDataAccess>();
 builder.Services.AddSingleton<IUserConfigDataAccess, UserConfigDataAccess>();
+builder.Services.AddSingleton<ISupplyRecordDataAccess, SupplyRecordDataAccess>();
+builder.Services.AddSingleton<IPlanRecordDataAccess, PlanRecordDataAccess>();
+builder.Services.AddSingleton<IOdometerRecordDataAccess, OdometerRecordDataAccess>();
 
 //configure helpers
 builder.Services.AddSingleton<IFileHelper, FileHelper>();

README.md

@@ -2,9 +2,14 @@
 
 A self-hosted, open-source vehicle service records and maintainence tracker.
 
+Support this project on Patreon: https://patreon.com/LubeLogger
+
 ## Why
 Because nobody should have to deal with a homemade spreadsheet or a shoebox full of receipts when it comes to vehicle maintainence.
 
+## Screenshots
+<a href="/docs/screenshots.md">Screenshots</a>
+
 ## Dependencies
 - Bootstrap
 - LiteDB

Views/API/Index.cshtml

@@ -125,3 +125,54 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
+@if (User.IsInRole(nameof(UserData.IsRootUser)))
+{
+    <div class="row">
+        <div class="col-1">
+            GET
+        </div>
+        <div class="col-5">
+            <code>/api/makebackup</code>
+        </div>
+        <div class="col-3">
+            Creates a snapshot/backup of the DB at the time and returns a URL to download it.
+        </div>
+        <div class="col-3">
+            No Params(must be root user)
+        </div>
+    </div>
+}
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/odometerrecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of odometer records for the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/odometerrecords/add</code>
+    </div>
+    <div class="col-3">
+        Returns a list of odometer records for 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 />
+        notes - notes(optional)<br />
+        }
+    </div>
+</div>

Views/Admin/Index.cshtml

@@ -37,7 +37,7 @@
                 </div>
             </div>
             <table class="table table-hover">
-                <thead>
+                <thead class="sticky-top">
                     <tr class="d-flex">
                         <th scope="col" class="col-4">Token</th>
                         <th scope="col" class="col-6">Issued To</th>
@@ -62,7 +62,7 @@
             <span class="lead">Users</span>
             <hr />
             <table class="table table-hover">
-                <thead>
+                <thead class="sticky-top">
                     <tr class="d-flex">
                         <th scope="col" class="col-4">Username</th>
                         <th scope="col" class="col-4">Email</th>

Views/Home/Index.cshtml

@@ -13,10 +13,10 @@
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
     <ul class="navbar-nav" id="homeTab" role="tablist">
         <li class="nav-item" role="presentation">
-            <button class="nav-link active" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-car-front me-2"></i>Garage</span></button>
+            <button class="nav-link @(Model == "garage" ? "active" : "")" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-car-front me-2"></i>Garage</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>Settings</span></button>
+            <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>Settings</span></button>
         </li>
         @if (User.IsInRole("CookieAuth"))
         {

Views/Home/_Settings.cshtml

@@ -1,4 +1,5 @@
-@model UserConfig
+@using CarCareTracker.Helper
+@model UserConfig
 
 <div class="row">
     <div class="d-flex justify-content-center">
@@ -22,8 +23,6 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useUKMPG" checked="@Model.UseUKMPG">
             <label class="form-check-label" for="useUKMPG">Use UK MPG Calculation<br /><small class="text-body-secondary">Input Gas Consumption in Liters, it will be converted to UK Gals for MPG Calculation</small></label>
         </div>
-    </div>
-    <div class="col-12 col-md-6">
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useDescending" checked="@Model.UseDescending">
             <label class="form-check-label" for="useDescending">Sort lists in Descending Order(Newest to Oldest)</label>
@@ -32,6 +31,10 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.HideZero">
             <label class="form-check-label" for="hideZero">Replace @(0.ToString("C")) Costs with ---</label>
         </div>
+        <div class="form-check form-switch">
+            <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>
         @if (User.IsInRole(nameof(UserData.IsRootUser)))
         {
             <div class="form-check form-switch">
@@ -40,6 +43,98 @@
             </div>
         }
     </div>
+    <div class="col-12 col-md-6">
+        <div class="row" id="visibleTabs">
+            <div class="col-12">
+                <span class="lead">Visible Tabs</span>
+            </div>
+            <div class="col-12 col-md-6">
+                <ul class="list-group">
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="ServiceRecord" id="serviceRecordTab" @(Model.VisibleTabs.Contains(ImportMode.ServiceRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="serviceRecordTab">Service Records</label>
+                    </li>
+                    <li class="list-group-item d-none">
+                        <input onChange="updateSettings()" disabled class="form-check-input me-1" type="checkbox" value="Dashboard" id="dashboardTab" @(Model.VisibleTabs.Contains(ImportMode.Dashboard) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="dashboardTab">Dashboard</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="RepairRecord" id="repairRecordTab" @(Model.VisibleTabs.Contains(ImportMode.RepairRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="repairRecordTab">Repairs</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="UpgradeRecord" id="upgradeRecordTab" @(Model.VisibleTabs.Contains(ImportMode.UpgradeRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="upgradeRecordTab">Upgrades</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="GasRecord" id="gasRecordTab" @(Model.VisibleTabs.Contains(ImportMode.GasRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="gasRecordTab">Fuel</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="OdometerRecord" id="odometerRecordTab" @(Model.VisibleTabs.Contains(ImportMode.OdometerRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="odometerRecordTab">Odometer</label>
+                    </li>
+                </ul>
+            </div>
+            <div class="col-12 col-md-6">
+                <ul class="list-group">
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="TaxRecord" id="taxRecordTab" @(Model.VisibleTabs.Contains(ImportMode.TaxRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="taxRecordTab">Taxes</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="NoteRecord" id="noteRecordTab" @(Model.VisibleTabs.Contains(ImportMode.NoteRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="noteRecordTab">Notes</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="ReminderRecord" id="reminderRecordTab" @(Model.VisibleTabs.Contains(ImportMode.ReminderRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="reminderRecordTab">Reminder</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="SupplyRecord" id="supplyRecordTab" @(Model.VisibleTabs.Contains(ImportMode.SupplyRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="supplyRecordTab">Supplies</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="PlanRecord" id="planRecordTab" @(Model.VisibleTabs.Contains(ImportMode.PlanRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="planRecordTab">Planner</label>
+                    </li>
+                </ul>
+            </div>
+        </div>
+       <div class="row">
+            <div class="col-12 col-md-6">
+                <span class="lead">Default Tab</span>
+                <select class="form-select" onchange="updateSettings()" id="defaultTab">
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.Dashboard)) value="Dashboard">Dashboard</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model,ImportMode.ServiceRecord)) value="ServiceRecord">Service Record</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.RepairRecord)) value="RepairRecord">Repairs</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.UpgradeRecord)) value="UpgradeRecord">Upgrades</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.GasRecord)) value="GasRecord">Fuel</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.TaxRecord)) value="TaxRecord">Tax</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.NoteRecord)) value="NoteRecord">Notes</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.ReminderRecord)) value="ReminderRecord">Reminders</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.SupplyRecord)) value="SupplyRecord">Supplies</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.PlanRecord)) value="PlanRecord">Planner</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.OdometerRecord)) value="OdometerRecord">Odometer</!option>
+                </select>
+            </div>
+            @if (User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                <div class="col-12 col-md-6">
+                    <span class="lead">Backups</span>
+                    <div class="row">
+                        <div class="col-6 d-grid">
+                            <button onclick="makeBackup()" class="btn btn-primary btn-md">Make</button>
+                        </div>
+                        <div class="col-6 d-grid">
+                            <input onChange="restoreBackup(this)" type="file" accept=".zip" class="d-none" id="inputBackup">
+                            <button onclick="openRestoreBackup()" class="btn btn-secondary btn-md">Restore</button>
+                        </div>
+                        </div>
+                </div> 
+            }
+       </div>
+    </div>
 </div>
 <div class="row">
     <div class="d-flex justify-content-center">
@@ -50,10 +145,16 @@
         <div class="d-flex justify-content-center">
             <img src="/defaults/lubelogger_logo.png" />
         </div>
+        <div class="d-flex justify-content-center">
+            <small class="text-body-secondary">Version 1.0.6</small>
+        </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.
         </p>
-        <p class="lead">If you enjoyed using this app, please consider spreading the good word.</p>
+        <p class="lead">
+            If you enjoyed using this app, please consider spreading the good word.<br />
+            If you are a commercial user, or if you just want to support the development of this project, consider subscribing to <a class="link-light link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://www.patreon.com/LubeLogger" target="_blank">our Patreon</a>
+        </p>
         <div class="d-flex justify-content-center">
             <h6 class="display-7 mt-2">Hometown Shoutout</h6>
         </div>
@@ -82,16 +183,32 @@
     </div>
 </div>
 <script>
+    function getCheckedTabs() {
+        var visibleTabs = $("#visibleTabs :checked").map(function () {
+            return this.value;
+        });
+        return visibleTabs.toArray();
+    }
     function updateSettings(){
+        var visibleTabs = getCheckedTabs();
+        var defaultTab = $("#defaultTab").val();
+        if (!visibleTabs.includes(defaultTab)){
+            defaultTab = "Dashboard"; //default to dashboard.
+        }
         var userConfigObject = {
             useDarkMode: $("#enableDarkMode").is(':checked'),
             enableCsvImports: $("#enableCsvImports").is(':checked'),
             useMPG: $("#useMPG").is(':checked'),
             useDescending: $("#useDescending").is(':checked'),
             hideZero: $("#hideZero").is(":checked"),
-            useUKMpg: $("#useUKMPG").is(":checked")
+            useUKMpg: $("#useUKMPG").is(":checked"),
+            useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
+            visibleTabs: visibleTabs,
+            defaultTab: defaultTab
         }
+        sloader.show();
         $.post('/Home/WriteToSettings', { userConfig: userConfigObject}, function(data){
+            sloader.hide();
             if (data) {
                 setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
             } else {
@@ -99,6 +216,40 @@
             }
         })
     }
+    function makeBackup() {
+        $.get('/Files/MakeBackup', function (data) {
+            window.location.href = data;
+        });
+    }
+    function openRestoreBackup(){
+        $("#inputBackup").click();
+    }
+    function restoreBackup(event) {
+        let formData = new FormData();
+        formData.append("file", event.files[0]);
+        sloader.show();
+        $.ajax({
+            url: "/Files/HandleFileUpload",
+            data: formData,
+            cache: false,
+            processData: false,
+            contentType: false,
+            type: 'POST',
+            success: function (response) {
+                if (response.trim() != '') {
+                    $.post('/Files/RestoreBackup', { fileName : response}, function (data) {
+                        sloader.hide();
+                        if (data){
+                            successToast("Backup Restored");
+                            setTimeout(function () { window.location.href = '/Home/Index' }, 500);
+                        } else {
+                            errorToast("An error occurred, please try again later.");
+                        }
+                    });
+                }
+            }
+        });
+    }
     function enableAuthCheckChanged(){
         var enableAuth = $("#enableAuth").is(":checked");
         if (enableAuth) {

Views/Vehicle/Index.cshtml

@@ -1,6 +1,11 @@
-@{
+@using CarCareTracker.Helper
+@{
     ViewData["Title"] = "LubeLogger - View Vehicle";
 }
+@inject IConfigHelper config
+@{
+    var userConfig = config.GetUserConfig(User);
+}
 @model Vehicle
 @section Scripts {
     <script src="~/js/vehicle.js" asp-append-version="true"></script>
@@ -12,6 +17,9 @@
     <script src="~/js/upgraderecord.js" asp-append-version="true"></script>
     <script src="~/js/note.js" asp-append-version="true"></script>
     <script src="~/js/reports.js" asp-append-version="true"></script>
+    <script src="~/js/supplyrecord.js" asp-append-version="true"></script>
+    <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>
 }
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
@@ -23,28 +31,37 @@
             <button class="nav-link" onclick="editVehicle(@Model.Id)"><span class="display-3 ms-2"><i class="bi bi-pencil-square"></i>Edit Vehicle</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link active" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-file-bar-graph me-2"></i>Dashboard</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.Dashboard)" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-file-bar-graph me-2"></i>Dashboard</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><span class="display-3 ms-2"><i class="bi bi-card-checklist me-2"></i>Service Records</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.PlanRecord)" id="plan-tab" data-bs-toggle="tab" data-bs-target="#plan-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-bar-chart-steps me-2"></i>Planner</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.OdometerRecord)" id="odometer-tab" data-bs-toggle="tab" data-bs-target="#odometer-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-speedometer me-2"></i>Odometer</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ServiceRecord)" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><span class="display-3 ms-2"><i class="bi bi-card-checklist me-2"></i>Service Records</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-fuel-pump me-2"></i>Fuel</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.RepairRecord)" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-currency-dollar me-2"></i>Taxes</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.UpgradeRecord)" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-journal-bookmark me-2"></i>Notes</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.GasRecord)" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-fuel-pump me-2"></i>Fuel</span></button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><div class="reminderBellDiv" style="display:inline-flex;"><i class="reminderBell bi bi-bell me-2"></i></div>Reminders</span></button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.SupplyRecord)" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-shop me-2"></i>Supplies</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.TaxRecord)" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-currency-dollar me-2"></i>Taxes</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.NoteRecord)" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-journal-bookmark me-2"></i>Notes</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ReminderRecord)" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><div class="reminderBellDiv" style="display:inline-flex;"><i class="reminderBell bi bi-bell me-2"></i></div>Reminders</span></button>
         </li>
         <li class="nav-item" role="presentation">
             <button onclick="deleteVehicle(@Model.Id)" class="dropdown-item"><span class="display-3 ms-2"><i class="bi bi-trash me-2"></i>Delete Vehicle</span></button>
@@ -65,28 +82,37 @@
     <hr />
     <ul class="nav nav-tabs lubelogger-tab" id="vehicleTab" role="tablist">
         <li class="nav-item" role="presentation">
-            <button class="nav-link active" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-file-bar-graph me-2"></i>Dash</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.Dashboard)" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-file-bar-graph me-2"></i>Dash</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><i class="bi bi-card-checklist me-2"></i>Service Records</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.PlanRecord)" id="plan-tab" data-bs-toggle="tab" data-bs-target="#plan-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-bar-chart-steps me-2"></i>Planner</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.OdometerRecord)" id="odometer-tab" data-bs-toggle="tab" data-bs-target="#odometer-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-speedometer me-2"></i>Odometer</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ServiceRecord)" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><i class="bi bi-card-checklist me-2"></i>Service Records</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-fuel-pump me-2"></i>Fuel</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.RepairRecord)" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-currency-dollar me-2"></i>Taxes</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.UpgradeRecord)" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-journal-bookmark me-2"></i>Notes</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.GasRecord)" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-fuel-pump me-2"></i>Fuel</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><div class="reminderBellDiv" style="display:inline-flex;"><i class="reminderBell bi bi-bell me-2"></i></div>Reminders</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.SupplyRecord)" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-shop me-2"></i>Supplies</button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.TaxRecord)" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-currency-dollar me-2"></i>Taxes</button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.NoteRecord)" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-journal-bookmark me-2"></i>Notes</button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ReminderRecord)" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><div class="reminderBellDiv" style="display:inline-flex;"><i class="reminderBell bi bi-bell me-2"></i></div>Reminders</button>
         </li>
         <li class="nav-item dropdown ms-auto" role="presentation">
             <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">Manage Vehicle</a>
@@ -96,14 +122,17 @@
         </li>
     </ul>
     <div class="tab-content" id="vehicleTabContent">
-        <div class="tab-pane fade" id="servicerecord-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="gas-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="tax-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="notes-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="accident-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="reminder-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade show active" id="report-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="upgrade-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.ServiceRecord)" id="servicerecord-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.GasRecord)" id="gas-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.TaxRecord)" id="tax-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.NoteRecord)" id="notes-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.RepairRecord)" id="accident-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.ReminderRecord)" id="reminder-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.Dashboard)" id="report-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.UpgradeRecord)" id="upgrade-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.SupplyRecord)" id="supply-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.PlanRecord)" id="plan-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.OdometerRecord)" id="odometer-tab-pane" role="tabpanel" tabindex="0"></div>
     </div>
 </div>
 <div class="modal fade" id="editVehicleModal" tabindex="-1" role="dialog">
@@ -128,5 +157,8 @@
     function GetVehicleId() {
         return { vehicleId: @Model.Id};
     }
+    function GetDefaultTab() {
+        return { tab: "@userConfig.DefaultTab" };
+    }
     bindWindowResize();
 </script>

Views/Vehicle/_BulkDataImporter.cshtml

@@ -25,6 +25,15 @@
                     } else if (Model == ImportMode.TaxRecord)
                     {
                         <a class="btn btn-link" href="/defaults/taxrecordsample.csv" target="_blank">Download Sample</a>
+                    } else if (Model == ImportMode.SupplyRecord)
+                    {
+                        <a class="btn btn-link" href="/defaults/supplysample.csv" target="_blank">Download Sample</a>
+                    } else if (Model == ImportMode.PlanRecord)
+                    {
+                        <a class="btn btn-link" href="/defaults/plansample.csv" target="_blank">Download Sample</a>
+                    } else if (Model == ImportMode.OdometerRecord)
+                    {
+                        <a class="btn btn-link" href="/defaults/odometersample.csv" target="_blank">Download Sample</a>
                     }
                 </div>
             </div>
@@ -62,6 +71,12 @@
                     getVehicleTaxRecords(vehicleId);
                 } else if (mode == "UpgradeRecord") {
                     getVehicleUpgradeRecords(vehicleId);
+                } else if (mode == "SupplyRecord") {
+                    getVehicleSupplyRecords(vehicleId);
+                } else if (mode == "PlanRecord"){
+                    getVehiclePlanRecords(vehicleId);
+                } else if (mode == "OdometerRecord") {
+                    getVehicleOdometerRecords(vehicleId);
                 }
             } else {
                 errorToast("An error has occurred, please double check the data and try again.");

Views/Vehicle/_CollisionRecords.cshtml

@@ -40,11 +40,11 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-1">Date</th>
+                    <th scope="col" class="col-2 col-xl-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
-                    <th scope="col" class="col-4">Description</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-3">Notes</th>
                 </tr>
@@ -53,9 +53,9 @@
                 @foreach (CollisionRecord collisionRecord in Model)
                 {
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditCollisionRecordModal(@collisionRecord.Id)">
-                        <td class="col-1">@collisionRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 col-xl-1">@collisionRecord.Date.ToShortDateString()</td>
                         <td class="col-2">@collisionRecord.Mileage</td>
-                        <td class="col-4">@collisionRecord.Description</td>
+                        <td class="col-3 col-xl-4">@collisionRecord.Description</td>
                         <td class="col-2">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
                         <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
                     </tr>

Views/Vehicle/_CostMakeUpReport.cshtml

@@ -9,7 +9,7 @@
             new Chart($("#pie-chart"), {
                 type: 'pie',
                 data: {
-                    labels: ["Planned Maintenance(Service Records)", "Unplanned Maintenance(Repairs)", "Upgrades", "Tax", "Fuel"],
+                    labels: ["Service Records", "Repairs", "Upgrades", "Tax", "Fuel"],
                     datasets: [
                         {
                             label: "Expenses by Category",

Views/Vehicle/_Gas.cshtml

@@ -2,10 +2,13 @@
 @inject IConfigHelper config
 @model GasRecordViewModelContainer
 @{
-    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
-    var useMPG = config.GetUserConfig(User).UseMPG;
-    var useUKMPG = config.GetUserConfig(User).UseUKMPG;
-    var hideZero = config.GetUserConfig(User).HideZero;
+    var userConfig = config.GetUserConfig(User);
+    var enableCsvImports = userConfig.EnableCsvImports;
+    var useMPG = userConfig.UseMPG;
+    var useUKMPG = userConfig.UseUKMPG;
+    var hideZero = userConfig.HideZero;
+    var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var gasCostFormat = useThreeDecimals ? "C3" : "C2";
     var useKwh = Model.UseKwh;
     string consumptionUnit;
     string fuelEconomyUnit;
@@ -42,7 +45,7 @@
                 <span class="ms-2 badge bg-primary">@($"Max Fuel Economy: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
             }
             <span class="ms-2 badge bg-success">@($"Total Fuel Consumed: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
-            <span class="ms-2 badge bg-success">@($"Total Cost: {Model.GasRecords.Sum(x => x.Cost).ToString("C3")}")</span>
+            <span class="ms-2 badge bg-success">@($"Total Cost: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
         </div>
         @if (enableCsvImports)
         {
@@ -69,7 +72,7 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-2">Date Refueled</th>
                     <th scope="col" class="col-2">Odometer(@(distanceUnit))</th>
@@ -87,8 +90,8 @@
                         <td class="col-2">@gasRecord.Mileage</td>
                         <td class="col-2">@gasRecord.Gallons.ToString("F")</td>
                         <td class="col-4">@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
-                        <td class="col-1">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString("C3"))</td>
-                        <td class="col-1">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString("C3"))</td>
+                        <td class="col-1">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
+                        <td class="col-1">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_GasModal.cshtml

@@ -56,9 +56,25 @@
                         <label class="form-check-label" for="gasIsMissed">Missed Fuel Up(Skip MPG Calculation)</label>
                     </div>
                     <label for="GasRecordCost">Cost</label>
-                    <input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                    @if (isNew)
+                    {
+                        <div class="input-group">
+                            <input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                            <div class="input-group-text">
+                                <select class="form-select form-select-sm" id="gasCostType">
+                                    <option value="total">Total</option>
+                                    <option value="unit">Unit</option>
+                                </select>
+                            </div>
+                        </div>
+                    } else
+                    {
+                        <input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                    }
                 </div>
                 <div class="col-md-6 col-12">
+                    <label for="gasRecordNotes">Notes(optional)</label>
+                    <textarea id="gasRecordNotes" class="form-control" rows="5">@Model.GasRecord.Notes</textarea>
                     @if (Model.GasRecord.Files.Any())
                     {
                         <div>

Views/Vehicle/_Notes.cshtml

@@ -17,7 +17,7 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-3">Description</th>
                     <th scope="col" class="col-9">Note</th>

Views/Vehicle/_OdometerRecordModal.cshtml

@@ -0,0 +1,71 @@
+@model OdometerRecordInput
+@{
+    var isNew = Model.Id == 0;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(isNew ? "Add New Odometer Record" : "Edit Odometer Record")</h5>
+    <button type="button" class="btn-close" onclick="hideAddOdometerRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="odometerRecordDate">Date</label>
+                    <div class="input-group">
+                        <input type="text" id="odometerRecordDate" class="form-control" placeholder="Date recorded" value="@Model.Date">
+                        <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
+                    </div>
+                    <label for="odometerRecordMileage">Odometer</label>
+                    <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>
+                    <textarea id="odometerRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @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">
+                        </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">
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    @if (!isNew)
+    {
+        <button type="button" class="btn btn-danger" onclick="deleteOdometerRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddOdometerRecordModal()">Cancel</button>
+    @if (isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveOdometerRecordToVehicle()">Add New Odometer Record</button>
+    }
+    else if (!isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveOdometerRecordToVehicle(true)">Edit Odometer Record</button>
+    }
+</div>
+<script>
+    var uploadedFiles = [];
+    getUploadedFilesFromModel();
+    function getUploadedFilesFromModel() {
+    @foreach (UploadedFiles filesUploaded in Model.Files)
+    {
+        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+    }
+        }
+    function getOdometerRecordModelData() {
+        return { id: @Model.Id}
+    }
+</script>

Views/Vehicle/_OdometerRecords.cshtml

@@ -0,0 +1,69 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@{
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
+}
+@model List<OdometerRecord>
+<div class="row">
+    <div class="d-flex justify-content-between">
+        <div class="d-flex align-items-center flex-wrap">
+            <span class="ms-2 badge bg-success">@($"# of Odometer Records: {Model.Count()}")</span>
+        </div>
+        <div>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddOdometerRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Odometer Record</button>
+                    <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                        <span class="visually-hidden">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('OdometerRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('OdometerRecord')">Export to CSV</a></li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddOdometerRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Odometer Record</button>
+            }
+        </div>
+    </div>
+</div>
+<div class="row vehicleDetailTabContainer">
+    <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
+        <table class="table table-hover">
+            <thead class="sticky-top">
+                <tr class="d-flex">
+                    <th scope="col" class="col-2 col-xl-1">Date</th>
+                    <th scope="col" class="col-3">Odometer</th>
+                    <th scope="col" class="col-7 col-xl-8">Notes</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (OdometerRecord odometerRecord in Model)
+                {
+                    <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>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<div class="modal fade" data-bs-focus="false" id="odometerRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="odometerRecordModalContent">
+        </div>
+    </div>
+</div>

Views/Vehicle/_PlanRecordItem.cshtml

@@ -0,0 +1,49 @@
+@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="card-body">
+        <div class="row">
+            <div class="col-12 col-lg-8 text-truncate">
+                @if (Model.Progress == PlanProgress.Done)
+                {
+                    <span class="taskCard-title text-truncate"><s>@Model.Description</s></span>
+                } else
+                {
+                    <span class="taskCard-title text-truncate">@Model.Description</span>
+                }
+            </div>
+            <div class="col-12 col-lg-4 d-flex align-items-center">
+                <span class="text-truncate">@Model.Cost.ToString("C2")</span>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-6 col-md-1">
+                @if (Model.ImportMode == ImportMode.ServiceRecord)
+                {
+                    <i class="bi bi-card-checklist"></i>
+                }
+                else if (Model.ImportMode == ImportMode.UpgradeRecord)
+                {
+                    <i class="bi bi-wrench-adjustable"></i>
+                }
+                else if (Model.ImportMode == ImportMode.RepairRecord)
+                {
+                    <i class="bi bi-exclamation-octagon"></i>
+                }
+            </div>
+            <div class="col-6 col-md-1">
+                @if (Model.Priority == PlanPriority.Critical)
+                {
+                    <i class="bi bi-fire"></i>
+                }
+                else if (Model.Priority == PlanPriority.Normal)
+                {
+                    <i class="bi bi-water"></i>
+                }
+                else if (Model.Priority == PlanPriority.Low)
+                {
+                    <i class="bi bi-snow"></i>
+                }
+            </div>
+        </div>
+    </div>
+</div>

Views/Vehicle/_PlanRecordModal.cshtml

@@ -0,0 +1,94 @@
+@model PlanRecordInput
+@{
+    var isNew = Model.Id == 0;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(isNew ? "Add New Plan Record" : "Edit Plan Record")</h5>
+    <button type="button" class="btn-close" onclick="hideAddPlanRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="planRecordDescription">Description</label>
+                    <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">
+                    <label for="planRecordType">Type</label>
+                    <select class="form-select" id="planRecordType">
+                        <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>Service</!option>
+                        <!option value="RepairRecord" @(Model.ImportMode == ImportMode.RepairRecord ? "selected" : "")>Repair</!option>
+                        <!option value="UpgradeRecord" @(Model.ImportMode == ImportMode.UpgradeRecord ? "selected" : "")>Upgrade</!option>
+                    </select>
+                    <label for="planRecordPriority">Priority</label>
+                    <select class="form-select" id="planRecordPriority">
+                        <!option value="Critical" @(Model.Priority == PlanPriority.Critical ? "selected" : "")>Critical</!option>
+                        <!option value="Normal" @(Model.Priority == PlanPriority.Normal || isNew ? "selected" : "")>Normal</!option>
+                        <!option value="Low" @(Model.Priority == PlanPriority.Low ? "selected" : "")>Low</!option>
+                    </select>
+                    <label for="planRecordProgress">Current Stage</label>
+                    <select class="form-select" id="planRecordProgress">
+                        <!option value="Backlog" @(Model.Progress == PlanProgress.Backlog ||isNew ? "selected" : "")>Planned</!option>
+                        <!option value="InProgress" @(Model.Progress == PlanProgress.InProgress ? "selected" : "")>Doing</!option>
+                        <!option value="Testing" @(Model.Progress == PlanProgress.Testing ? "selected" : "")>Testing</!option>
+                    </select>
+                    @if (!isNew)
+                    {
+                        <label>Date Created: @Model.DateCreated</label>
+                        <label>Last Modified: @Model.DateModified</label>
+                    }
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="planRecordNotes">Notes(optional)</label>
+                    <textarea id="planRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @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">
+                        </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">
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    @if (!isNew)
+    {
+        <button type="button" class="btn btn-danger" onclick="deletePlanRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">Cancel</button>
+    @if (isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle()">Add New Plan Record</button>
+    }
+    else if (!isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle(true)">Edit Plan Record</button>
+    }
+</div>
+<script>
+    var uploadedFiles = [];
+    getUploadedFilesFromModel();
+    function getUploadedFilesFromModel() {
+    @foreach (UploadedFiles filesUploaded in Model.Files)
+    {
+        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+    }
+        }
+    function getPlanRecordModelData() {
+        return { 
+            id: @Model.Id,
+            dateCreated: decodeHTMLEntities('@(Model.DateCreated)')
+        }
+    }
+</script>

Views/Vehicle/_PlanRecords.cshtml

@@ -0,0 +1,100 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@{
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
+    var backLogItems = Model.Where(x => x.Progress == PlanProgress.Backlog).OrderBy(x=>x.Priority);
+    var inProgressItems = Model.Where(x => x.Progress == PlanProgress.InProgress).OrderBy(x => x.Priority);
+    var testingItems = Model.Where(x => x.Progress == PlanProgress.Testing).OrderBy(x => x.Priority);
+    var doneItems = Model.Where(x => x.Progress == PlanProgress.Done).OrderBy(x => x.Priority);
+}
+@model List<PlanRecord>
+<div class="row">
+    <div class="d-flex justify-content-between">
+        <div class="d-flex align-items-center flex-wrap">
+            <span class="ms-2 badge bg-success">@($"# of Plan Records: {Model.Count()}")</span>
+        </div>
+        <div>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddPlanRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Plan Record</button>
+                    <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                        <span class="visually-hidden">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('PlanRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('PlanRecord')">Export to CSV</a></li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddPlanRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Plan Record</button>
+            }
+        </div>
+    </div>
+</div>
+<div class="row vehicleDetailTabContainer fixed">
+    <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
+        <div class="row swimlane">
+            <div class="col-3 d-flex flex-column swimlane mid" ondragover="dragOver(event)" ondrop="dropBox(event, 'Backlog')">
+                <div class="row">
+                    <div class="col-12 d-flex justify-content-center" style="height:5vh;">
+                        <span class="display-7">Planned</span>
+                    </div>
+                </div>
+                @foreach (PlanRecord planRecord in backLogItems)
+                {
+                    @await Html.PartialAsync("_PlanRecordItem", planRecord)
+                }
+            </div>
+            <div class="col-3 d-flex flex-column swimlane mid" ondragover="dragOver(event)" ondrop="dropBox(event, 'InProgress')">
+                <div class="row">
+                    <div class="col-12 d-flex justify-content-center" style="height:5vh;">
+                        <span class="display-7">Doing</span>
+                    </div>
+                </div>
+                @foreach (PlanRecord planRecord in inProgressItems)
+                {
+                    @await Html.PartialAsync("_PlanRecordItem", planRecord)
+                }
+            </div>
+            <div class="col-3 d-flex flex-column swimlane" ondragover="dragOver(event)" ondrop="dropBox(event, 'Testing')">
+                <div class="row">
+                    <div class="col-12 d-flex justify-content-center" style="height:5vh;">
+                        <span class="display-7">Testing</span>
+                    </div>
+                </div>
+                @foreach (PlanRecord planRecord in testingItems)
+                {
+                    @await Html.PartialAsync("_PlanRecordItem", planRecord)
+                }
+            </div>
+            <div class="col-3 d-flex flex-column swimlane end" ondragover="dragOver(event)" ondrop="dropBox(event, 'Done')">
+                <div class="row">
+                    <div class="col-12 d-flex justify-content-center" style="height:5vh;">
+                        <span class="display-7">Done</span>
+                    </div>
+                </div>
+                @foreach (PlanRecord planRecord in doneItems)
+                {
+                    @await Html.PartialAsync("_PlanRecordItem", planRecord)
+                }
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div class="modal fade" data-bs-focus="false" id="planRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="planRecordModalContent">
+        </div>
+    </div>
+</div>

Views/Vehicle/_ReminderRecordModal.cshtml

@@ -41,6 +41,27 @@
                 <div class="col-md-6 col-12">
                     <label for="reminderNotes">Notes(optional)</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">
+                        <label class="form-check-label" for="reminderIsRecurring">Is Recurring</label>
+                    </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="OneThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneThousandMiles ? "selected" : "")>1000 mi. / Km</!option>
+                        <!option value="ThreeThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.ThreeThousandMiles ? "selected" : "")>3000 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="FiftyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiftyThousandMiles ? "selected" : "")>50000 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="FiveYears" @(Model.ReminderMonthInterval == ReminderMonthInterval.FiveYears ? "selected" : "")>5 Years</!option>
+                    </select>
                 </div>
             </div>
         </div>

Views/Vehicle/_ReminderRecords.cshtml

@@ -21,7 +21,7 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Urgency</th>
                     <th scope="col" class="col-2">Metric</th>

Views/Vehicle/_Report.cshtml

@@ -1,4 +1,5 @@
 @model ReportViewModel
+<div class="container reportTabContainer">
 <div class="row hideOnPrint">
     <div class="col-md-3 col-12 mt-2">
         <div class="row">
@@ -20,7 +21,8 @@
     </div>
     <div class="col-md-6 col-12 mt-2">
         <div class="row">
-            <div class="col-12 d-flex justify-content-center reportsCheckBoxContainer">
+            <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>
@@ -42,6 +44,7 @@
                     <label class="form-check-label" for="taxExpenseCheck">Tax</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">
@@ -83,4 +86,5 @@
         </div>
     </div>
 </div>
+</div>
 <div id="vehicleHistoryReport" class="showOnPrint"></div>

Views/Vehicle/_ServiceRecords.cshtml

@@ -40,11 +40,11 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-1">Date</th>
+                    <th scope="col" class="col-2 col-xl-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
-                    <th scope="col" class="col-4">Description</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-3">Notes</th>
                 </tr>
@@ -53,9 +53,9 @@
                 @foreach (ServiceRecord serviceRecord in Model)
                 {
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditServiceRecordModal(@serviceRecord.Id)">
-                        <td class="col-1">@serviceRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 col-xl-1">@serviceRecord.Date.ToShortDateString()</td>
                         <td class="col-2">@serviceRecord.Mileage</td>
-                        <td class="col-4">@serviceRecord.Description</td>
+                        <td class="col-3 col-xl-4">@serviceRecord.Description</td>
                         <td class="col-2">@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))</td>
                         <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes)</td>
                     </tr>

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -0,0 +1,85 @@
+@model SupplyRecordInput
+@{
+    var isNew = Model.Id == 0;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(isNew ? "Add New Supply Record" : "Edit Supply Record")</h5>
+    <button type="button" class="btn-close" onclick="hideAddSupplyRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="supplyRecordDate">Date</label>
+                    <div class="input-group">
+                        <input type="text" id="supplyRecordDate" class="form-control" placeholder="Date purchased" value="@Model.Date">
+                        <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
+                    </div>
+                    <label for="supplyRecordPartNumber">Part Number</label>
+                    <input type="text" id="supplyRecordPartNumber" class="form-control" placeholder="Part #/Model #/SKU #" value="@(isNew ? "" : Model.PartNumber)">
+                    <label for="supplyRecordDescription">Description</label>
+                    <input type="text" id="supplyRecordDescription" class="form-control" placeholder="Description of the Part/Supplies" value="@Model.Description">
+                    <label for="supplyRecordSupplier">Supplier/Vendor</label>
+                    <input type="text" id="supplyRecordSupplier" class="form-control" placeholder="Part Supplier" value="@Model.PartSupplier">
+                    <div class="row">
+                        <div class="col-md-6 col-12">
+                            <label for="supplyRecordQuantity">Quantity</label>
+                            <input type="text" id="supplyRecordQuantity" class="form-control" placeholder="Quantity" value="@(isNew ? "1" : Model.Quantity)">
+                        </div>
+                        <div class="col-md-6 col-12">
+                            <label for="supplyRecordCost">Cost</label>
+                            <input type="text" id="supplyRecordCost" class="form-control" placeholder="Cost" value="@(isNew ? "" : Model.Cost)">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="supplyRecordNotes">Notes(optional)</label>
+                    <textarea id="supplyRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @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">
+                        </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">
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    @if (!isNew)
+    {
+        <button type="button" class="btn btn-danger" onclick="deleteSupplyRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddSupplyRecordModal()">Cancel</button>
+    @if (isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveSupplyRecordToVehicle()">Add New Supply Record</button>
+    }
+    else if (!isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveSupplyRecordToVehicle(true)">Edit Supply Record</button>
+    }
+</div>
+<script>
+    var uploadedFiles = [];
+    getUploadedFilesFromModel();
+    function getUploadedFilesFromModel() {
+    @foreach (UploadedFiles filesUploaded in Model.Files)
+    {
+        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+    }
+        }
+    function getSupplyRecordModelData() {
+        return { id: @Model.Id}
+    }
+</script>

Views/Vehicle/_SupplyRecords.cshtml

@@ -0,0 +1,78 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@{
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
+}
+@model List<SupplyRecord>
+<div class="row">
+    <div class="d-flex justify-content-between">
+        <div class="d-flex align-items-center flex-wrap">
+            <span class="ms-2 badge bg-success">@($"# of Supply Records: {Model.Count()}")</span>
+            <span class="ms-2 badge bg-primary">@($"Total: {Model.Sum(x => x.Cost).ToString("C")}")</span>
+        </div>
+        <div>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddSupplyRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Supply Record</button>
+                    <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                        <span class="visually-hidden">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('SupplyRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('SupplyRecord')">Export to CSV</a></li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddSupplyRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Supply Record</button>
+            }
+        </div>
+    </div>
+</div>
+<div class="row vehicleDetailTabContainer">
+    <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
+        <table class="table table-hover">
+            <thead class="sticky-top">
+                <tr class="d-flex">
+                    <th scope="col" class="col-2 col-xl-1">Date</th>
+                    <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-2">Notes</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (SupplyRecord supplyRecord in Model)
+                {
+                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditSupplyRecordModal(@supplyRecord.Id)">
+                        <td class="col-2 col-xl-1">@supplyRecord.Date.ToShortDateString()</td>
+                        <td class="col-2">@supplyRecord.PartNumber</td>
+                        <td class="col-2">@supplyRecord.PartSupplier</td>
+                        <td class="col-2 col-xl-3">@supplyRecord.Description</td>
+                        <td class="col-1">@supplyRecord.Quantity</td>
+                        <td class="col-1">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes)</td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<div class="modal fade" data-bs-focus="false" id="supplyRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="supplyRecordModalContent">
+        </div>
+    </div>
+</div>

Views/Vehicle/_TaxRecords.cshtml

@@ -40,10 +40,10 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-1">Date</th>
-                    <th scope="col" class="col-6">Description</th>
+                    <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-3">Notes</th>
                 </tr>
@@ -52,8 +52,8 @@
                 @foreach (TaxRecord taxRecord in Model)
                 {
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditTaxRecordModal(@taxRecord.Id)">
-                        <td class="col-1">@taxRecord.Date.ToShortDateString()</td>
-                        <td class="col-6">@taxRecord.Description</td>
+                        <td class="col-3 col-xl-1">@taxRecord.Date.ToShortDateString()</td>
+                        <td class="col-4 col-xl-6">@taxRecord.Description</td>
                         <td class="col-2">@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C"))</td>
                         <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(taxRecord.Notes)</td>
                     </tr>

Views/Vehicle/_UpgradeRecords.cshtml

@@ -40,11 +40,11 @@
             </div>
         </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-1">Date</th>
+                    <th scope="col" class="col-2 col-xl-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
-                    <th scope="col" class="col-4">Description</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-3">Notes</th>
                 </tr>
@@ -53,9 +53,9 @@
                 @foreach (UpgradeRecord upgradeRecord in Model)
                 {
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditUpgradeRecordModal(@upgradeRecord.Id)">
-                        <td class="col-1">@upgradeRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 col-xl-1">@upgradeRecord.Date.ToShortDateString()</td>
                         <td class="col-2">@upgradeRecord.Mileage</td>
-                        <td class="col-4">@upgradeRecord.Description</td>
+                        <td class="col-3 col-xl-4">@upgradeRecord.Description</td>
                         <td class="col-2">@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))</td>
                         <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes)</td>
                     </tr>

Views/Vehicle/_UploadedFiles.cshtml

@@ -5,7 +5,7 @@
     {
         <li class="list-group-item">
             <div class="d-flex justify-content-between">
-                <a type="button" class="btn btn-link" href="@filesUploaded.Location" target="_blank">@filesUploaded.Name</a>
+                <a type="button" class="btn btn-link text-truncate uploadedFileName" href="@filesUploaded.Location" target="_blank">@filesUploaded.Name</a>
                 <div class="d-flex align-items-center">
                     <button type="button" class="btn btn-sm btn-outline-secondary me-2" onclick="editFileName('@filesUploaded.Location', this)"><i class="bi bi-pencil"></i></button>
                     <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteFileFromUploadedFiles('@filesUploaded.Location', this)"><i class="bi bi-trash"></i></button>

appsettings.json

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

docs/screenshots.md

@@ -0,0 +1,42 @@
+## Garage
+![image](https://github.com/hargata/lubelog/assets/155338622/c15a4efb-89d5-4eca-bccd-f148bf063f80)
+
+## Dashboard
+![image](https://github.com/hargata/lubelog/assets/155338622/970f8e8e-bef9-4de2-b43c-dfa1d43c2d87)
+
+## Track Service Records / Repairs / Upgrades
+![image](https://github.com/hargata/lubelog/assets/155338622/26c6fd47-66b5-4135-8cee-e6c89bc671be)
+
+## Attach Files to Records (i.e.: Receipts, Invoices, etc)
+![image](https://github.com/hargata/lubelog/assets/155338622/1c52c3a3-f750-4327-ae91-0c345f305e52)
+
+## Import/Export from/to CSV (Supports Imports from Fuelly)
+![image](https://github.com/hargata/lubelog/assets/155338622/d5fbcade-17fd-4b46-95eb-2ecafbbf6614)
+
+## Track Gas Records(Supports MPG, L/100KM)
+### Even supports British use-cases - Purchase Gas in Liters and Calculates in Miles per UK Gallons
+![image](https://github.com/hargata/lubelog/assets/155338622/2bb61362-93b3-45c1-a02e-34b65ed883c0)
+
+## Reminders
+![image](https://github.com/hargata/lubelog/assets/155338622/51b224e2-eaf3-4895-85af-8264a944ff99)
+
+## Set Reminders based on Odometer, Date, or whichever comes first
+![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)
+
+## Admin Panel (Generate Tokens for new users to sign up)
+![image](https://github.com/hargata/lubelog/assets/155338622/60cd0dc1-3444-4917-aaf9-aa64a5e62202)
+
+## Token Based Registration for New Users
+![image](https://github.com/hargata/lubelog/assets/155338622/261a143f-cac0-4961-bcd0-bdb61be6990a)
+
+## Track Supplies and Parts purchased for your vehicle
+![image](https://github.com/hargata/lubelog/assets/155338622/fa380cd1-209f-4d50-a001-cda9531c42ef)
+
+## Add Collaborators (Multiple People can Add/Edit Records for same Vehicle)
+![image](https://github.com/hargata/lubelog/assets/155338622/0ec57dc4-c552-48b9-9a8e-4d89b691aade)
+
+## Consolidated Vehicle Maintenance Report
+![image](https://github.com/hargata/lubelog/assets/155338622/d9081c57-0d29-4d44-b793-c46ce08539fc)

wwwroot/css/site.css

@@ -35,18 +35,39 @@ html {
     overflow-y: auto;
     overflow-x: auto;
 }
+.reportTabContainer {
+    max-height: 85vh;
+    overflow-y: auto;
+    overflow-x: auto;
+}
+
+.vehicleDetailTabContainer.fixed {
+    height: 65vh;
+}
+
+.swimlane{
+    height:100%;
+}
+.swimlane.mid {
+    border-right-style: solid;
+}
+.swimlane.end {
+        border-left-style: solid;
+    }
 
 .showOnPrint {
-    display:none;
+    display: none;
 }
 
 @media print {
     .hideOnPrint {
-        display:none;
+        display: none;
     }
-    .showOnPrint{
-        display:block !important;
+
+    .showOnPrint {
+        display: block !important;
     }
+
     .vehicleDetailTabContainer {
         background-color: #fff !important;
         height: 100%;
@@ -60,18 +81,22 @@ html {
         color: #000 !important;
         overflow: visible;
     }
+
     table {
         background-color: #fff !important;
     }
+
     ul {
         border: 0px !important;
         background-color: #fff !important;
     }
+
     li {
         color: #000 !important;
         border: 0px !important;
         background-color: #fff !important;
     }
+
     td {
         color: #000 !important;
         border: hidden;
@@ -81,7 +106,8 @@ html {
         td.col-1 {
             width: 10%;
         }
-        td.col-4.text-wrap{
+
+        td.col-4.text-wrap {
             width: 30%;
         }
 
@@ -94,7 +120,7 @@ html {
         background-color: #fff !important;
     }
 
-    tr{
+    tr {
         border: hidden;
     }
 }
@@ -183,10 +209,10 @@ html {
         align-items: center;
     }
 
-    .lubelogger-navbar-button > button {
-        padding: 0;
-        font-size: 2rem;
-    }
+        .lubelogger-navbar-button > button {
+            padding: 0;
+            font-size: 2rem;
+        }
 
     .lubelogger-menu-icon {
         display: inline-block;
@@ -196,19 +222,20 @@ html {
 
     .lubelogger-mobile-nav {
         background-color: var(--bs-body-bg);
-        height: 100vh;
+        height: max(100vh, 100%);
         width: 100%;
         position: absolute;
         top: 0;
         left: 0;
         margin: 0;
         display: none;
-        z-index: 10;
+        z-index: 2000;
     }
 
     .lubelogger-mobile-nav-show {
         display: block;
     }
+
     .lubelogger-mobile-nav > ul > li > .nav-link.active {
         color: #6ea8fe;
     }
@@ -231,3 +258,39 @@ html {
         display: none;
     }
 }
+
+.dropdown-menu.show {
+    z-index: 1030;
+}
+
+input[type="file"] {
+    max-width: 100%;
+}
+
+.uploadedFileName {
+    max-width: 75%;
+}
+
+.taskCard {
+    max-height: 20vh;
+    padding:0.5rem;
+    overflow:hidden;
+    border-radius: 4px;
+    box-shadow: 0 6px 10px rgba(0,0,0,.08), 0 0 6px rgba(0,0,0,.05);
+    transition: .3s transform cubic-bezier(.155,1.105,.295,1.12),.3s box-shadow,.3s -webkit-transform cubic-bezier(.155,1.105,.295,1.12);
+    cursor: pointer;
+}
+.taskCard.nodrag{
+    cursor:not-allowed;
+}
+.taskCard-title{
+    font-size:1.5rem;
+    font-weight:300;
+    max-height:10vh;
+}
+[data-bs-theme=dark] .taskCard {
+    background-color: rgba(255,255,255,0.5);
+}
+[data-bs-theme=light] .taskCard {
+    background-color: rgba(80,80,80,0.25);
+}

wwwroot/defaults/gassample.csv

@@ -1,3 +1,3 @@
-Date,Odometer,FuelConsumed,Cost
-5/8/2020,204836,8.331,16.24
-5/30/2020,205056,11.913,25.72
+Date,Odometer,FuelConsumed,Cost,IsFillToFull,MissedFuelUp,Notes
+5/8/2020,204836,8.331,16.24,True,False,
+5/30/2020,205056,11.913,25.72,True,False,

wwwroot/defaults/odometersample.csv

@@ -0,0 +1,2 @@
+Date,Odometer,Notes
+1/1/2024,260001,test test

wwwroot/defaults/plansample.csv

@@ -0,0 +1,2 @@
+DateCreated,DateModified,Description,Notes,Type,Priority,Progress,Cost
+1/19/2024 6:01:02 PM,1/19/2024 7:32:58 PM,Repair Exhaust,,RepairRecord,Normal,Testing,$50.00

wwwroot/defaults/supplysample.csv

@@ -0,0 +1,2 @@
+Date,PartNumber,PartSupplier,PartQuantity,Description,Cost,Notes
+1/16/2024,‎EVA17872045551,Evan Fischer,1,Front Bumper,$95.14,Altima Activities

wwwroot/js/collisionrecord.js

@@ -59,6 +59,7 @@ function saveCollisionRecordToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Repair Record Updated" : "Repair Record Added.");
             hideAddCollisionRecordModal();
+            saveScrollPosition();
             getVehicleCollisionRecords(formValues.vehicleId);
             if (formValues.addReminderRecord) {
                 setTimeout(function () { showAddReminderModal(formValues); }, 500);

wwwroot/js/gasrecord.js

@@ -59,6 +59,7 @@ function saveGasRecordToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Gas Record Updated" : "Gas Record Added.");
             hideAddGasRecordModal();
+            saveScrollPosition();
             getVehicleGasRecords(formValues.vehicleId);
         } else {
             errorToast("An error has occurred, please try again later.");
@@ -70,8 +71,10 @@ function getAndValidateGasRecordValues() {
     var gasMileage = $("#gasRecordMileage").val();
     var gasGallons = $("#gasRecordGallons").val();
     var gasCost = $("#gasRecordCost").val();
+    var gasCostType = $("#gasCostType").val();
     var gasIsFillToFull = $("#gasIsFillToFull").is(":checked");
     var gasIsMissed = $("#gasIsMissed").is(":checked");
+    var gasNotes = $("#gasRecordNotes").val();
     var vehicleId = GetVehicleId().vehicleId;
     var gasRecordId = getGasRecordModelData().id;
     //validation
@@ -88,12 +91,23 @@ function getAndValidateGasRecordValues() {
     } else {
         $("#gasRecordMileage").removeClass("is-invalid");
     }
-    if (gasGallons.trim() == '' || parseInt(gasGallons) < 0) {
+    if (gasGallons.trim() == '' || parseFloat(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))
+        {
+            hasError = true;
+            $("#gasRecordCost").addClass("is-invalid");
+        } else {
+            $("#gasRecordCost").removeClass("is-invalid");
+        }
+    }
     if (gasCost.trim() == '' || !isValidMoney(gasCost)) {
         hasError = true;
         $("#gasRecordCost").addClass("is-invalid");
@@ -110,6 +124,7 @@ function getAndValidateGasRecordValues() {
         cost: gasCost,
         files: uploadedFiles,
         isFillToFull: gasIsFillToFull,
-        missedFuelUp: gasIsMissed
+        missedFuelUp: gasIsMissed,
+        notes: gasNotes
     }
 }

wwwroot/js/note.js

@@ -55,6 +55,7 @@ function saveNoteToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Note Updated" : "Note Added.");
             hideAddNoteModal();
+            saveScrollPosition();
             getVehicleNotes(formValues.vehicleId);
         } else {
             errorToast("An error has occurred, please try again later.");

wwwroot/js/odometerrecord.js

@@ -0,0 +1,101 @@
+function showAddOdometerRecordModal() {
+    $.get('/Vehicle/GetAddOdometerRecordPartialView', function (data) {
+        if (data) {
+            $("#odometerRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#odometerRecordDate'));
+            $('#odometerRecordModal').modal('show');
+        }
+    });
+}
+function showEditOdometerRecordModal(odometerRecordId) {
+    $.get(`/Vehicle/GetOdometerRecordForEditById?odometerRecordId=${odometerRecordId}`, function (data) {
+        if (data) {
+            $("#odometerRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#odometerRecordDate'));
+            $('#odometerRecordModal').modal('show');
+        }
+    });
+}
+function hideAddOdometerRecordModal() {
+    $('#odometerRecordModal').modal('hide');
+}
+function deleteOdometerRecord(odometerRecordId) {
+    $("#workAroundInput").show();
+    Swal.fire({
+        title: "Confirm Deletion?",
+        text: "Deleted Odometer Records cannot be restored.",
+        showCancelButton: true,
+        confirmButtonText: "Delete",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post(`/Vehicle/DeleteOdometerRecordById?odometerRecordId=${odometerRecordId}`, function (data) {
+                if (data) {
+                    hideAddOdometerRecordModal();
+                    successToast("Odometer Record Deleted");
+                    var vehicleId = GetVehicleId().vehicleId;
+                    getVehicleOdometerRecords(vehicleId);
+                } else {
+                    errorToast("An error has occurred, please try again later.");
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
+function saveOdometerRecordToVehicle(isEdit) {
+    //get values
+    var formValues = getAndValidateOdometerRecordValues();
+    //validate
+    if (formValues.hasError) {
+        errorToast("Please check the form data");
+        return;
+    }
+    //save to db.
+    $.post('/Vehicle/SaveOdometerRecordToVehicleId', { odometerRecord: formValues }, function (data) {
+        if (data) {
+            successToast(isEdit ? "Odometer Record Updated" : "Odometer Record Added.");
+            hideAddOdometerRecordModal();
+            saveScrollPosition();
+            getVehicleOdometerRecords(formValues.vehicleId);
+            if (formValues.addReminderRecord) {
+                setTimeout(function () { showAddReminderModal(formValues); }, 500);
+            }
+        } else {
+            errorToast("An error has occurred, please try again later.");
+        }
+    })
+}
+function getAndValidateOdometerRecordValues() {
+    var serviceDate = $("#odometerRecordDate").val();
+    var serviceMileage = $("#odometerRecordMileage").val();
+    var serviceNotes = $("#odometerRecordNotes").val();
+    var vehicleId = GetVehicleId().vehicleId;
+    var odometerRecordId = getOdometerRecordModelData().id;
+    //validation
+    var hasError = false;
+    if (serviceDate.trim() == '') { //eliminates whitespace.
+        hasError = true;
+        $("#odometerRecordDate").addClass("is-invalid");
+    } else {
+        $("#odometerRecordDate").removeClass("is-invalid");
+    }
+    if (serviceMileage.trim() == '' || parseInt(serviceMileage) < 0) {
+        hasError = true;
+        $("#odometerRecordMileage").addClass("is-invalid");
+    } else {
+        $("#odometerRecordMileage").removeClass("is-invalid");
+    }
+    return {
+        id: odometerRecordId,
+        hasError: hasError,
+        vehicleId: vehicleId,
+        date: serviceDate,
+        mileage: serviceMileage,
+        notes: serviceNotes,
+        files: uploadedFiles
+    }
+}

wwwroot/js/planrecord.js

@@ -0,0 +1,179 @@
+function showAddPlanRecordModal() {
+    $.get('/Vehicle/GetAddPlanRecordPartialView', function (data) {
+        if (data) {
+            $("#planRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#planRecordDate'));
+            $('#planRecordModal').modal('show');
+        }
+    });
+}
+function showEditPlanRecordModal(planRecordId) {
+    $.get(`/Vehicle/GetPlanRecordForEditById?planRecordId=${planRecordId}`, function (data) {
+        if (data) {
+            $("#planRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#planRecordDate'));
+            $('#planRecordModal').modal('show');
+        }
+    });
+}
+function hideAddPlanRecordModal() {
+    $('#planRecordModal').modal('hide');
+}
+function deletePlanRecord(planRecordId) {
+    $("#workAroundInput").show();
+    Swal.fire({
+        title: "Confirm Deletion?",
+        text: "Deleted Plan Records cannot be restored.",
+        showCancelButton: true,
+        confirmButtonText: "Delete",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post(`/Vehicle/DeletePlanRecordById?planRecordId=${planRecordId}`, function (data) {
+                if (data) {
+                    hideAddPlanRecordModal();
+                    successToast("Plan Record Deleted");
+                    var vehicleId = GetVehicleId().vehicleId;
+                    getVehiclePlanRecords(vehicleId);
+                } else {
+                    errorToast("An error has occurred, please try again later.");
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
+function savePlanRecordToVehicle(isEdit) {
+    //get values
+    var formValues = getAndValidatePlanRecordValues();
+    //validate
+    if (formValues.hasError) {
+        errorToast("Please check the form data");
+        return;
+    }
+    //save to db.
+    $.post('/Vehicle/SavePlanRecordToVehicleId', { planRecord: formValues }, function (data) {
+        if (data) {
+            successToast(isEdit ? "Plan Record Updated" : "Plan Record Added.");
+            hideAddPlanRecordModal();
+            saveScrollPosition();
+            getVehiclePlanRecords(formValues.vehicleId);
+            if (formValues.addReminderRecord) {
+                setTimeout(function () { showAddReminderModal(formValues); }, 500);
+            }
+        } else {
+            errorToast("An error has occurred, please try again later.");
+        }
+    })
+}
+function getAndValidatePlanRecordValues() {
+    var planDescription = $("#planRecordDescription").val();
+    var planCost = $("#planRecordCost").val();
+    var planNotes = $("#planRecordNotes").val();
+    var planType = $("#planRecordType").val();
+    var planPriority = $("#planRecordPriority").val();
+    var planProgress = $("#planRecordProgress").val();
+    var planDateCreated = getPlanRecordModelData().dateCreated;
+    var vehicleId = GetVehicleId().vehicleId;
+    var planRecordId = getPlanRecordModelData().id;
+    //validation
+    var hasError = false;
+    if (planDescription.trim() == '') {
+        hasError = true;
+        $("#planRecordDescription").addClass("is-invalid");
+    } else {
+        $("#planRecordDescription").removeClass("is-invalid");
+    }
+    if (planCost.trim() == '' || !isValidMoney(planCost)) {
+        hasError = true;
+        $("#planRecordCost").addClass("is-invalid");
+    } else {
+        $("#planRecordCost").removeClass("is-invalid");
+    }
+    return {
+        id: planRecordId,
+        hasError: hasError,
+        vehicleId: vehicleId,
+        dateCreated: planDateCreated,
+        description: planDescription,
+        cost: planCost,
+        notes: planNotes,
+        files: uploadedFiles,
+        priority: planPriority,
+        progress: planProgress,
+        importMode: planType
+    }
+}
+//drag and drop stuff.
+
+let dragged = null;
+let draggedId = 0;
+function dragEnter(event) {
+    event.preventDefault();
+}
+function dragStart(event, planRecordId) {
+    dragged = event.target;
+    draggedId = planRecordId;
+    event.dataTransfer.setData('text/plain', draggedId);
+}
+function dragOver(event) {
+    event.preventDefault();
+}
+function dropBox(event, newProgress) {
+    if ($(event.target).hasClass("swimlane")) {
+        if (dragged.parentElement != event.target && event.target != dragged) {
+            updatePlanRecordProgress(newProgress);
+        }
+    }
+    event.preventDefault();
+}
+function updatePlanRecordProgress(newProgress) {
+    if (draggedId > 0) {
+        if (newProgress == 'Done') {
+            //if user is marking the task as done, we will want them to enter the mileage so that we can auto-convert it.
+            Swal.fire({
+                title: 'Mark Task as Done?',
+                html: `<p>To confirm, please enter the current odometer reading on your vehicle, as we also need the current odometer to auto convert the task into the relevant record.</p>
+                            <input type="text" id="inputOdometer" class="swal2-input" placeholder="Odometer Reading">
+                            `,
+                confirmButtonText: 'Confirm',
+                showCancelButton: true,
+                focusConfirm: false,
+                preConfirm: () => {
+                    const odometer = $("#inputOdometer").val();
+                    if (!odometer || isNaN(odometer)) {
+                        Swal.showValidationMessage(`Please enter an odometer reading`)
+                    }
+                    return { odometer }
+                },
+            }).then(function (result) {
+                if (result.isConfirmed) {
+                    $.post('/Vehicle/UpdatePlanRecordProgress', { planRecordId: draggedId, planProgress: newProgress, odometer: result.value.odometer }, function (data) {
+                        if (data) {
+                            successToast("Plan Progress Updated");
+                            var vehicleId = GetVehicleId().vehicleId;
+                            getVehiclePlanRecords(vehicleId);
+                        } else {
+                            errorToast("An error has occurred, please try again later.");
+                        }
+                    });
+                }
+                draggedId = 0;
+            });
+        } else {
+            $.post('/Vehicle/UpdatePlanRecordProgress', { planRecordId: draggedId, planProgress: newProgress }, function (data) {
+                if (data) {
+                    successToast("Plan Progress Updated");
+                    var vehicleId = GetVehicleId().vehicleId;
+                    getVehiclePlanRecords(vehicleId);
+                } else {
+                    errorToast("An error has occurred, please try again later.");
+                }
+            });
+            draggedId = 0;
+        }
+    }
+}

wwwroot/js/reminderrecord.js

@@ -51,6 +51,7 @@ function saveReminderRecordToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Reminder Updated" : "Reminder Added.");
             hideAddReminderRecordModal();
+            saveScrollPosition();
             getVehicleReminders(formValues.vehicleId);
         } else {
             errorToast("An error has occurred, please try again later.");
@@ -68,12 +69,27 @@ function appendMileageToOdometer(increment) {
     reminderMileage += increment;
     $("#reminderMileage").val(reminderMileage);
 }
+
+function enableRecurring() {
+    var reminderIsRecurring = $("#reminderIsRecurring").is(":checked");
+    if (reminderIsRecurring) {
+        $("#reminderRecurringMileage").attr('disabled', false);
+        $("#reminderRecurringMonth").attr('disabled', false);
+    } else {
+        $("#reminderRecurringMileage").attr('disabled', true);
+        $("#reminderRecurringMonth").attr('disabled', true);
+    }
+}
+
 function getAndValidateReminderRecordValues() {
     var reminderDate = $("#reminderDate").val();
     var reminderMileage = $("#reminderMileage").val();
     var reminderDescription = $("#reminderDescription").val();
     var reminderNotes = $("#reminderNotes").val();
     var reminderOption = $('#reminderOptions input:radio:checked').val();
+    var reminderIsRecurring = $("#reminderIsRecurring").is(":checked");
+    var reminderRecurringMonth = $("#reminderRecurringMonth").val();
+    var reminderRecurringMileage = $("#reminderRecurringMileage").val();
     var vehicleId = GetVehicleId().vehicleId;
     var reminderId = getReminderRecordModelData().id;
     //validation
@@ -117,6 +133,9 @@ function getAndValidateReminderRecordValues() {
         mileage: reminderMileage,
         description: reminderDescription,
         notes: reminderNotes,
-        metric: reminderOption
+        metric: reminderOption,
+        isRecurring: reminderIsRecurring,
+        reminderMileageInterval: reminderRecurringMileage,
+        reminderMonthInterval: reminderRecurringMonth
     }
 }

wwwroot/js/servicerecord.js

@@ -59,6 +59,7 @@ function saveServiceRecordToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Service Record Updated" : "Service Record Added.");
             hideAddServiceRecordModal();
+            saveScrollPosition();
             getVehicleServiceRecords(formValues.vehicleId);
             if (formValues.addReminderRecord) {
                 setTimeout(function () { showAddReminderModal(formValues); }, 500);

wwwroot/js/shared.js

@@ -143,3 +143,8 @@ function bindWindowResize() {
         hideMobileNav();
     });
 }
+function decodeHTMLEntities(text) {
+    return $("<textarea/>")
+        .html(text)
+        .text();
+}

wwwroot/js/supplyrecord.js

@@ -0,0 +1,121 @@
+function showAddSupplyRecordModal() {
+    $.get('/Vehicle/GetAddSupplyRecordPartialView', function (data) {
+        if (data) {
+            $("#supplyRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#supplyRecordDate'));
+            $('#supplyRecordModal').modal('show');
+        }
+    });
+}
+function showEditSupplyRecordModal(supplyRecordId) {
+    $.get(`/Vehicle/GetSupplyRecordForEditById?supplyRecordId=${supplyRecordId}`, function (data) {
+        if (data) {
+            $("#supplyRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#supplyRecordDate'));
+            $('#supplyRecordModal').modal('show');
+        }
+    });
+}
+function hideAddSupplyRecordModal() {
+    $('#supplyRecordModal').modal('hide');
+}
+function deleteSupplyRecord(supplyRecordId) {
+    $("#workAroundInput").show();
+    Swal.fire({
+        title: "Confirm Deletion?",
+        text: "Deleted Supply Records cannot be restored.",
+        showCancelButton: true,
+        confirmButtonText: "Delete",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post(`/Vehicle/DeleteSupplyRecordById?supplyRecordId=${supplyRecordId}`, function (data) {
+                if (data) {
+                    hideAddSupplyRecordModal();
+                    successToast("Supply Record Deleted");
+                    var vehicleId = GetVehicleId().vehicleId;
+                    getVehicleSupplyRecords(vehicleId);
+                } else {
+                    errorToast("An error has occurred, please try again later.");
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
+function saveSupplyRecordToVehicle(isEdit) {
+    //get values
+    var formValues = getAndValidateSupplyRecordValues();
+    //validate
+    if (formValues.hasError) {
+        errorToast("Please check the form data");
+        return;
+    }
+    //save to db.
+    $.post('/Vehicle/SaveSupplyRecordToVehicleId', { supplyRecord: formValues }, function (data) {
+        if (data) {
+            successToast(isEdit ? "Supply Record Updated" : "Supply Record Added.");
+            hideAddSupplyRecordModal();
+            saveScrollPosition();
+            getVehicleSupplyRecords(formValues.vehicleId);
+            if (formValues.addReminderRecord) {
+                setTimeout(function () { showAddReminderModal(formValues); }, 500);
+            }
+        } else {
+            errorToast("An error has occurred, please try again later.");
+        }
+    })
+}
+function getAndValidateSupplyRecordValues() {
+    var supplyDate = $("#supplyRecordDate").val();
+    var supplyPartNumber = $("#supplyRecordPartNumber").val();
+    var supplyDescription = $("#supplyRecordDescription").val();
+    var supplySupplier = $("#supplyRecordSupplier").val();
+    var supplyQuantity = $("#supplyRecordQuantity").val();
+    var supplyCost = $("#supplyRecordCost").val();
+    var supplyNotes = $("#supplyRecordNotes").val();
+    var vehicleId = GetVehicleId().vehicleId;
+    var supplyRecordId = getSupplyRecordModelData().id;
+    //validation
+    var hasError = false;
+    if (supplyDate.trim() == '') { //eliminates whitespace.
+        hasError = true;
+        $("#supplyRecordDate").addClass("is-invalid");
+    } else {
+        $("#supplyRecordDate").removeClass("is-invalid");
+    }
+    if (supplyDescription.trim() == '') {
+        hasError = true;
+        $("#supplyRecordDescription").addClass("is-invalid");
+    } else {
+        $("#supplyRecordDescription").removeClass("is-invalid");
+    }
+    if (supplyQuantity.trim() == '' || !isValidMoney(supplyQuantity) || parseFloat(supplyQuantity) < 0) {
+        hasError = true;
+        $("#supplyRecordQuantity").addClass("is-invalid");
+    } else {
+        $("#supplyRecordQuantity").removeClass("is-invalid");
+    }
+    if (supplyCost.trim() == '' || !isValidMoney(supplyCost)) {
+        hasError = true;
+        $("#supplyRecordCost").addClass("is-invalid");
+    } else {
+        $("#supplyRecordCost").removeClass("is-invalid");
+    }
+    return {
+        id: supplyRecordId,
+        hasError: hasError,
+        vehicleId: vehicleId,
+        date: supplyDate,
+        partNumber: supplyPartNumber,
+        partSupplier: supplySupplier,
+        description: supplyDescription,
+        cost: supplyCost,
+        notes: supplyNotes,
+        quantity: supplyQuantity,
+        files: uploadedFiles
+    }
+}

wwwroot/js/taxrecord.js

@@ -59,6 +59,7 @@ function saveTaxRecordToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Tax Record Updated" : "Tax Record Added.");
             hideAddTaxRecordModal();
+            saveScrollPosition();
             getVehicleTaxRecords(formValues.vehicleId);
             if (formValues.addReminderRecord) {
                 setTimeout(function () { showAddReminderModal(formValues); }, 500);

wwwroot/js/upgraderecord.js

@@ -59,6 +59,7 @@ function saveUpgradeRecordToVehicle(isEdit) {
         if (data) {
             successToast(isEdit ? "Upgrade Record Updated" : "Upgrade Record Added.");
             hideAddUpgradeRecordModal();
+            saveScrollPosition();
             getVehicleUpgradeRecords(formValues.vehicleId);
             if (formValues.addReminderRecord) {
                 setTimeout(function () { showAddReminderModal(formValues); }, 500);

wwwroot/js/vehicle.js

@@ -30,6 +30,15 @@ $(document).ready(function () {
             case "upgrade-tab":
                 getVehicleUpgradeRecords(vehicleId);
                 break;
+            case "supply-tab":
+                getVehicleSupplyRecords(vehicleId);
+                break;
+            case "plan-tab":
+                getVehiclePlanRecords(vehicleId);
+                break;
+            case "odometer-tab":
+                getVehicleOdometerRecords(vehicleId);
+                break;
         }
         switch (e.relatedTarget.id) { //clear out previous tabs with grids in them to help with performance
             case "servicerecord-tab":
@@ -56,15 +65,60 @@ $(document).ready(function () {
             case "notes-tab":
                 $("#notes-tab-pane").html("");
                 break;
+            case "supply-tab":
+                $("#supply-tab-pane").html("");
+                break;
+            case "plan-tab":
+                $("#plan-tab-pane").html("");
+                break;
+            case "odometer-tab":
+                $("odometer-tab-pane").html("");
+                break;
         }
     });
-    getVehicleReport(vehicleId);
+    var defaultTab = GetDefaultTab().tab;
+    switch (defaultTab) {
+        case "ServiceRecord":
+            getVehicleServiceRecords(vehicleId);
+            break;
+        case "NoteRecord":
+            getVehicleNotes(vehicleId);
+            break;
+        case "GasRecord":
+            getVehicleGasRecords(vehicleId);
+            break;
+        case "RepairRecord":
+            getVehicleCollisionRecords(vehicleId);
+            break;
+        case "TaxRecord":
+            getVehicleTaxRecords(vehicleId);
+            break;
+        case "Dashboard":
+            getVehicleReport(vehicleId);
+            break;
+        case "ReminderRecord":
+            getVehicleReminders(vehicleId);
+            break;
+        case "UpgradeRecord":
+            getVehicleUpgradeRecords(vehicleId);
+            break;
+        case "SupplyRecord":
+            getVehicleSupplyRecords(vehicleId);
+            break;
+        case "PlanRecord":
+            getVehiclePlanRecords(vehicleId);
+            break;
+        case "OdometerRecord":
+            getVehicleOdometerRecords(vehicleId);
+            break;
+    }
 });
 
 function getVehicleNotes(vehicleId) {
     $.get(`/Vehicle/GetNotesByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#notes-tab-pane").html(data);
+            restoreScrollPosition();
         }
     });
 }
@@ -72,6 +126,34 @@ function getVehicleServiceRecords(vehicleId) {
     $.get(`/Vehicle/GetServiceRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#servicerecord-tab-pane").html(data);
+            restoreScrollPosition();
+            getVehicleHaveImportantReminders(vehicleId);
+        }
+    });
+}
+function getVehiclePlanRecords(vehicleId) {
+    $.get(`/Vehicle/GetPlanRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
+        if (data) {
+            $("#plan-tab-pane").html(data);
+            restoreScrollPosition();
+            getVehicleHaveImportantReminders(vehicleId);
+        }
+    });
+}
+function getVehicleOdometerRecords(vehicleId) {
+    $.get(`/Vehicle/GetOdometerRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
+        if (data) {
+            $("#odometer-tab-pane").html(data);
+            restoreScrollPosition();
+            getVehicleHaveImportantReminders(vehicleId);
+        }
+    });
+}
+function getVehicleSupplyRecords(vehicleId) {
+    $.get(`/Vehicle/GetSupplyRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
+        if (data) {
+            $("#supply-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -80,6 +162,7 @@ function getVehicleUpgradeRecords(vehicleId) {
     $.get(`/Vehicle/GetUpgradeRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#upgrade-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -88,6 +171,7 @@ function getVehicleGasRecords(vehicleId) {
     $.get(`/Vehicle/GetGasRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#gas-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -96,6 +180,7 @@ function getVehicleCollisionRecords(vehicleId) {
     $.get(`/Vehicle/GetCollisionRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#accident-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -104,6 +189,7 @@ function getVehicleTaxRecords(vehicleId) {
     $.get(`/Vehicle/GetTaxRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#tax-tab-pane").html(data);
+            restoreScrollPosition();
         }
     });
 }
@@ -111,6 +197,7 @@ function getVehicleReminders(vehicleId) {
     $.get(`/Vehicle/GetReminderRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#reminder-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -119,6 +206,7 @@ function getVehicleReport(vehicleId) {
     $.get(`/Vehicle/GetReportPartialView?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#report-tab-pane").html(data);
+            getVehicleHaveImportantReminders(vehicleId);
         }
     })
 }
@@ -254,3 +342,11 @@ function editFileName(fileLocation, event) {
         }
     });
 }
+var scrollPosition = 0;
+function saveScrollPosition() {
+    scrollPosition = $(".vehicleDetailTabContainer").scrollTop();
+}
+function restoreScrollPosition() {
+    $(".vehicleDetailTabContainer").scrollTop(scrollPosition);
+    scrollPosition = 0;
+}