no delete option.

added patreon link and version number.

.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/docker-image.yml

@@ -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

@@ -107,7 +107,16 @@ namespace CarCareTracker.Controllers
         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()
+                });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]

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,6 +25,7 @@ namespace CarCareTracker.Controllers
         private readonly ITaxRecordDataAccess _taxRecordDataAccess;
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
         private readonly IWebHostEnvironment _webEnv;
         private readonly bool _useDescending;
         private readonly IConfigHelper _config;
@@ -47,6 +48,7 @@ namespace CarCareTracker.Controllers
             ITaxRecordDataAccess taxRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            ISupplyRecordDataAccess supplyRecordDataAccess,
             IUserLogic userLogic,
             IWebHostEnvironment webEnv,
             IConfigHelper config)
@@ -64,6 +66,7 @@ namespace CarCareTracker.Controllers
             _taxRecordDataAccess = taxRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _supplyRecordDataAccess = supplyRecordDataAccess;
             _userLogic = userLogic;
             _webEnv = webEnv;
             _config = config;
@@ -133,6 +136,7 @@ namespace CarCareTracker.Controllers
                 _noteDataAccess.DeleteAllNotesByVehicleId(vehicleId) &&
                 _reminderRecordDataAccess.DeleteAllReminderRecordsByVehicleId(vehicleId) &&
                 _upgradeRecordDataAccess.DeleteAllUpgradeRecordsByVehicleId(vehicleId) &&
+                _supplyRecordDataAccess.DeleteAllSupplyRecordsByVehicleId(vehicleId) &&
                 _userLogic.DeleteAllAccessToVehicle(vehicleId) &&
                 _dataAccess.DeleteVehicle(vehicleId);
             return Json(result);
@@ -209,7 +213,33 @@ namespace CarCareTracker.Controllers
                     return Json($"/{fileNameToExport}");
                 }
             }
-            else if (mode == ImportMode.TaxRecord) {
+            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);
@@ -235,7 +265,16 @@ 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()
+                });
                 using (var writer = new StreamWriter(fullExportFilePath))
                 {
                     using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
@@ -270,7 +309,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())
                         {
@@ -292,7 +331,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 +340,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.
@@ -355,6 +398,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()
@@ -634,7 +692,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 +726,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 +739,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 +791,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 +869,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))]
@@ -1053,5 +1110,61 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         #endregion
+        #region "Supply Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
+        {
+            var result = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
+            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
     }
 }

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,10 @@
         RepairRecord = 1,
         GasRecord = 2,
         TaxRecord = 3,
-        UpgradeRecord = 4
+        UpgradeRecord = 4,
+        ReminderRecord = 5,
+        NoteRecord = 6,
+        SupplyRecord = 7,
+        Dashboard = 8
     }
 }

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/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)}");
+                    }
+                }
+                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)}");
+                    }
+                }
+                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,9 @@ namespace CarCareTracker.Helper
                         Gallons = convertedConsumption,
                         Cost = currentObject.Cost,
                         DeltaMileage = deltaMileage,
-                        CostPerGallon = currentObject.Cost / convertedConsumption
+                        CostPerGallon = currentObject.Cost / convertedConsumption,
+                        IsFillToFull = currentObject.IsFillToFull,
+                        MissedFuelUp = currentObject.MissedFuelUp
                     };
                     if (currentObject.MissedFuelUp)
                     {
@@ -81,7 +83,9 @@ namespace CarCareTracker.Helper
                         Cost = currentObject.Cost,
                         DeltaMileage = 0,
                         MilesPerGallon = 0,
-                        CostPerGallon = currentObject.Cost / convertedConsumption
+                        CostPerGallon = currentObject.Cost / convertedConsumption,
+                        IsFillToFull = currentObject.IsFillToFull,
+                        MissedFuelUp = currentObject.MissedFuelUp
                     });
                 }
                 previousMileage = currentObject.Mileage;

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,9 +3,9 @@ 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.Odometer).Name(["odometer"]);
@@ -16,7 +16,10 @@ 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"]);
         }
     }
 }

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/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>

Models/GasRecord/GasRecordViewModel.cs

@@ -18,5 +18,7 @@
         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; }
     }
 }

Models/ImportModel.cs

@@ -15,6 +15,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
@@ -40,6 +54,8 @@
         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 class ReminderExportModel
     {

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/Upgrades/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,7 @@ 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>();
 
 //configure helpers
 builder.Services.AddSingleton<IFileHelper, FileHelper>();

README.md

@@ -2,6 +2,8 @@
 
 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.
 

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/_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,88 @@
             </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>
+                </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>
+                </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>
+                </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 +135,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 +173,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 +206,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,7 @@
     <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="~/lib/chart-js/chart.umd.js"></script>
 }
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
@@ -23,28 +29,31 @@
             <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.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="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.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="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.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="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.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="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.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" 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.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" 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.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 +74,31 @@
     <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.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="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.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="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.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="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.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="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.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" 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.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" 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.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 +108,15 @@
         </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>
 </div>
 <div class="modal fade" id="editVehicleModal" tabindex="-1" role="dialog">
@@ -128,5 +141,8 @@
     function GetVehicleId() {
         return { vehicleId: @Model.Id};
     }
+    function GetDefaultTab() {
+        return { tab: "@userConfig.DefaultTab" };
+    }
     bindWindowResize();
 </script>

Views/Vehicle/_BulkDataImporter.cshtml

@@ -25,6 +25,9 @@
                     } 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>
                     }
                 </div>
             </div>
@@ -62,6 +65,8 @@
                     getVehicleTaxRecords(vehicleId);
                 } else if (mode == "UpgradeRecord") {
                     getVehicleUpgradeRecords(vehicleId);
+                } else if (mode == "SupplyRecord") {
+                    getVehicleSupplyRecords(vehicleId);
                 }
             } else {
                 errorToast("An error has occurred, please double check the data and try again.");

Views/Vehicle/_CollisionRecords.cshtml

@@ -40,7 +40,7 @@
             </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">Odometer</th>

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/_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/_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/_ServiceRecords.cshtml

@@ -40,7 +40,7 @@
             </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">Odometer</th>

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-1">Date</th>
+                    <th scope="col" class="col-2">Part #</th>
+                    <th scope="col" class="col-2">Supplier</th>
+                    <th scope="col" class="col-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-1">@supplyRecord.Date.ToShortDateString()</td>
+                        <td class="col-2">@supplyRecord.PartNumber</td>
+                        <td class="col-2">@supplyRecord.PartSupplier</td>
+                        <td class="col-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,7 +40,7 @@
             </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>

Views/Vehicle/_UpgradeRecords.cshtml

@@ -40,7 +40,7 @@
             </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">Odometer</th>

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": ""
 }

wwwroot/css/site.css

@@ -203,7 +203,7 @@ html {
         left: 0;
         margin: 0;
         display: none;
-        z-index: 10;
+        z-index: 2000;
     }
 
     .lubelogger-mobile-nav-show {
@@ -231,3 +231,7 @@ html {
         display: none;
     }
 }
+
+.dropdown-menu.show{
+    z-index: 1030;
+}

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
+5/8/2020,204836,8.331,16.24,True,False
+5/30/2020,205056,11.913,25.72,True,False

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.");

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/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.");

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/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,9 @@ $(document).ready(function () {
             case "upgrade-tab":
                 getVehicleUpgradeRecords(vehicleId);
                 break;
+            case "supply-tab":
+                getVehicleSupplyRecords(vehicleId);
+                break;
         }
         switch (e.relatedTarget.id) { //clear out previous tabs with grids in them to help with performance
             case "servicerecord-tab":
@@ -56,15 +59,48 @@ $(document).ready(function () {
             case "notes-tab":
                 $("#notes-tab-pane").html("");
                 break;
+            case "supply-tab":
+                $("#supply-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;
+    }
 });
 
 function getVehicleNotes(vehicleId) {
     $.get(`/Vehicle/GetNotesByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#notes-tab-pane").html(data);
+            restoreScrollPosition();
         }
     });
 }
@@ -72,6 +108,16 @@ function getVehicleServiceRecords(vehicleId) {
     $.get(`/Vehicle/GetServiceRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#servicerecord-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 +126,7 @@ function getVehicleUpgradeRecords(vehicleId) {
     $.get(`/Vehicle/GetUpgradeRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#upgrade-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -88,6 +135,7 @@ function getVehicleGasRecords(vehicleId) {
     $.get(`/Vehicle/GetGasRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#gas-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -96,6 +144,7 @@ function getVehicleCollisionRecords(vehicleId) {
     $.get(`/Vehicle/GetCollisionRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#accident-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -104,6 +153,7 @@ function getVehicleTaxRecords(vehicleId) {
     $.get(`/Vehicle/GetTaxRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#tax-tab-pane").html(data);
+            restoreScrollPosition();
         }
     });
 }
@@ -111,6 +161,7 @@ function getVehicleReminders(vehicleId) {
     $.get(`/Vehicle/GetReminderRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#reminder-tab-pane").html(data);
+            restoreScrollPosition();
             getVehicleHaveImportantReminders(vehicleId);
         }
     });
@@ -119,6 +170,7 @@ function getVehicleReport(vehicleId) {
     $.get(`/Vehicle/GetReportPartialView?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#report-tab-pane").html(data);
+            getVehicleHaveImportantReminders(vehicleId);
         }
     })
 }
@@ -254,3 +306,11 @@ function editFileName(fileLocation, event) {
         }
     });
 }
+var scrollPosition = 0;
+function saveScrollPosition() {
+    scrollPosition = $(".vehicleDetailTabContainer").scrollTop();
+}
+function restoreScrollPosition() {
+    $(".vehicleDetailTabContainer").scrollTop(scrollPosition);
+    scrollPosition = 0;
+}