Merge pull request #422 from hargata/Hargata/auto.oidc

Enable auto login via OIDC

.env

@@ -6,4 +6,8 @@ MailConfig__UseSSL="false"
 MailConfig__Port=587
 MailConfig__Username=""
 MailConfig__Password=""
-LOGGING__LOGLEVEL__DEFAULT=Error
+LOGGING__LOGLEVEL__DEFAULT=Error
+
+# * Uncoment this line if you use postgresSQL as database backend.
+# * Check the docker-compose.postgresql.yml file
+#POSTGRES_CONNECTION="Host=postgres;Username=lubelogger;Password=lubepass;Database=lubelogger;"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Report a bug
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Checklist**
+Please make sure you have performed the following steps before opening a new bug ticket, change `[ ]` to `[x]` to mark it as done
+
+- [ ] I have read and tried the steps outlined in the [Troubleshooting Guide](https://docs.lubelogger.com/Troubleshooting)
+- [ ] I have searched through existing issues.
+
+**Description**
+<!-- Describe the bug below this line -->
+
+**Platform**
+- [ ] Docker Image
+- [ ] Windows Standalone Executable
+
+**Browser Console Errors(F12)**
+<!-- Attach a screenshot or codeblock containing the browser console error -->
+
+**App/Container Console Error**
+<!-- Attach a screenshot or codeblock containing the app/container console error -->
+
+**Screenshots(optional)**
+<!-- Attach a screenshot describing the bug -->

.gitignore

@@ -11,3 +11,4 @@ wwwroot/translations/
 config/userConfig.json
 CarCareTracker.csproj.user
 Properties/launchSettings.json
+data/cartracker-log.db

CarCareTracker.csproj

@@ -13,7 +13,8 @@
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
-    <PackageReference Include="Npgsql" Version="8.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
   </ItemGroup>
 
 </Project>

Controllers/APIController.cs

@@ -1,5 +1,4 @@
-using CarCareTracker.External.Implementations;
-using CarCareTracker.External.Interfaces;
+using CarCareTracker.External.Interfaces;
 using CarCareTracker.Filter;
 using CarCareTracker.Helper;
 using CarCareTracker.Logic;
@@ -27,6 +26,7 @@ namespace CarCareTracker.Controllers
         private readonly IReminderHelper _reminderHelper;
         private readonly IGasHelper _gasHelper;
         private readonly IUserLogic _userLogic;
+        private readonly IOdometerLogic _odometerLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IMailHelper _mailHelper;
         private readonly IConfigHelper _config;
@@ -46,7 +46,8 @@ namespace CarCareTracker.Controllers
             IMailHelper mailHelper,
             IFileHelper fileHelper,
             IConfigHelper config,
-            IUserLogic userLogic) 
+            IUserLogic userLogic,
+            IOdometerLogic odometerLogic) 
         {
             _dataAccess = dataAccess;
             _noteDataAccess = noteDataAccess;
@@ -63,6 +64,7 @@ namespace CarCareTracker.Controllers
             _gasHelper = gasHelper;
             _reminderHelper = reminderHelper;
             _userLogic = userLogic;
+            _odometerLogic = odometerLogic;
             _fileHelper = fileHelper;
             _config = config;
         }
@@ -138,8 +140,9 @@ namespace CarCareTracker.Controllers
                         Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                         Mileage = int.Parse(input.Odometer)
                     };
-                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                    _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Service Record via API - Description: {serviceRecord.Description}");
                 response.Success = true;
                 response.Message = "Service Record Added";
                 return Json(response);
@@ -205,8 +208,9 @@ namespace CarCareTracker.Controllers
                         Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                         Mileage = int.Parse(input.Odometer)
                     };
-                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                    _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Repair Record via API - Description: {repairRecord.Description}");
                 response.Success = true;
                 response.Message = "Repair Record Added";
                 return Json(response);
@@ -272,8 +276,9 @@ namespace CarCareTracker.Controllers
                         Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                         Mileage = int.Parse(input.Odometer)
                     };
-                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                    _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Upgrade Record via API - Description: {upgradeRecord.Description}");
                 response.Success = true;
                 response.Message = "Upgrade Record Added";
                 return Json(response);
@@ -327,6 +332,7 @@ namespace CarCareTracker.Controllers
                     Cost = decimal.Parse(input.Cost)
                 };
                 _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord);
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Tax Record via API - Description: {taxRecord.Description}");
                 response.Success = true;
                 response.Message = "Tax Record Added";
                 return Json(response);
@@ -341,11 +347,24 @@ namespace CarCareTracker.Controllers
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
+        [Route("/api/vehicle/odometerrecords/latest")]
+        public IActionResult LastOdometer(int vehicleId)
+        {
+            var result = GetMaxMileage(vehicleId);
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
         [Route("/api/vehicle/odometerrecords")]
         public IActionResult OdometerRecords(int vehicleId)
         {
             var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
-            var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Odometer = x.Mileage.ToString(), Notes = x.Notes });
+            //determine if conversion is needed.
+            if (vehicleRecords.All(x => x.InitialMileage == default))
+            {
+                vehicleRecords = _odometerLogic.AutoConvertOdometerRecord(vehicleRecords);
+            }
+            var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), InitialOdometer = x.InitialMileage.ToString(), Odometer = x.Mileage.ToString(), Notes = x.Notes });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -376,9 +395,11 @@ namespace CarCareTracker.Controllers
                     VehicleId = vehicleId,
                     Date = DateTime.Parse(input.Date),
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                    InitialMileage = (string.IsNullOrWhiteSpace(input.InitialOdometer) || int.Parse(input.InitialOdometer) == default) ? _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List<OdometerRecord>()) : int.Parse(input.InitialOdometer),
                     Mileage = int.Parse(input.Odometer)
                 };
                 _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Odometer Record via API - Mileage: {odometerRecord.Mileage.ToString()}");
                 response.Success = true;
                 response.Message = "Odometer Record Added";
                 return Json(response);
@@ -458,8 +479,9 @@ namespace CarCareTracker.Controllers
                         Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                         Mileage = int.Parse(input.Odometer)
                     };
-                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                    _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Gas record via API - Mileage: {gasRecord.Mileage.ToString()}");
                 response.Success = true;
                 response.Message = "Gas Record Added";
                 return Json(response);

Controllers/AdminController.cs

@@ -3,8 +3,6 @@ using CarCareTracker.Logic;
 using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Net;
-using System.Net.Mail;
 
 namespace CarCareTracker.Controllers
 {

Controllers/FilesController.cs

@@ -1,12 +1,5 @@
-using CarCareTracker.External.Interfaces;
 using CarCareTracker.Models;
-using LiteDB;
 using Microsoft.AspNetCore.Mvc;
-using System.Diagnostics;
-using static System.Net.Mime.MediaTypeNames;
-using System.Drawing;
-using System.Linq.Expressions;
-using Microsoft.Extensions.Logging;
 using CarCareTracker.Helper;
 using Microsoft.AspNetCore.Authorization;
 

Controllers/HomeController.cs

@@ -15,6 +15,7 @@ namespace CarCareTracker.Controllers
         private readonly ILogger<HomeController> _logger;
         private readonly IVehicleDataAccess _dataAccess;
         private readonly IUserLogic _userLogic;
+        private readonly ILoginLogic _loginLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IConfigHelper _config;
         private readonly IExtraFieldDataAccess _extraFieldDataAccess;
@@ -23,6 +24,7 @@ namespace CarCareTracker.Controllers
         public HomeController(ILogger<HomeController> logger,
             IVehicleDataAccess dataAccess,
             IUserLogic userLogic,
+            ILoginLogic loginLogic,
             IConfigHelper configuration,
             IFileHelper fileHelper,
             IExtraFieldDataAccess extraFieldDataAccess,
@@ -37,6 +39,7 @@ namespace CarCareTracker.Controllers
             _extraFieldDataAccess = extraFieldDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _reminderHelper = reminderHelper;
+            _loginLogic = loginLogic;
         }
         private int GetUserID()
         {
@@ -63,21 +66,26 @@ namespace CarCareTracker.Controllers
                 vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
             }
             List<ReminderRecordViewModel> reminders = new List<ReminderRecordViewModel>();
-            foreach(Vehicle vehicle in vehiclesStored)
+            foreach (Vehicle vehicle in vehiclesStored)
             {
                 var vehicleReminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
                 vehicleReminders.RemoveAll(x => x.Metric == ReminderMetric.Odometer);
                 //we don't care about mileages so we can basically fake the current vehicle mileage.
                 if (vehicleReminders.Any())
                 {
-                    var maxMileage = vehicleReminders.Max(x => x.Mileage) + 1000;
-                    var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(vehicleReminders, maxMileage, DateTime.Now);
-                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Date = x.Date, Urgency = x.Urgency, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate} - {x.Description}" }).ToList();
+                    var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(vehicleReminders, 0, DateTime.Now);
+                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Id = x.Id, Date = x.Date, Urgency = x.Urgency, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate} - {x.Description}" }).ToList();
                     reminders.AddRange(reminderUrgency);
                 }
             }
             return PartialView("_Calendar", reminders);
         }
+        public IActionResult ViewCalendarReminder(int reminderId)
+        {
+            var reminder = _reminderRecordDataAccess.GetReminderRecordById(reminderId);
+            var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(new List<ReminderRecord> { reminder }, 0, DateTime.Now).FirstOrDefault();
+            return PartialView("_ReminderRecordCalendarModal", reminderUrgency);
+        }
         public IActionResult Settings()
         {
             var userConfig = _config.GetUserConfig(User);
@@ -92,13 +100,28 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult WriteToSettings(UserConfig userConfig)
         {
+            //retrieve existing userConfig.
+            var existingConfig = _config.GetUserConfig(User);
+            //copy over stuff that persists
+            userConfig.UserColumnPreferences = existingConfig.UserColumnPreferences;
+            userConfig.ReminderUrgencyConfig = existingConfig.ReminderUrgencyConfig;
             var result = _config.SaveUserConfig(User, userConfig);
             return Json(result);
         }
+        [HttpPost]
+        public IActionResult SaveReminderUrgencyThreshold(ReminderUrgencyConfig reminderUrgencyConfig)
+        {
+            //retrieve existing userConfig.
+            var existingConfig = _config.GetUserConfig(User);
+            existingConfig.ReminderUrgencyConfig = reminderUrgencyConfig;
+            var result = _config.SaveUserConfig(User, existingConfig);
+            return Json(result);
+        }
         public IActionResult Privacy()
         {
             return View();
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
         public IActionResult GetExtraFieldsModal(int importMode = 0)
         {
             var recordExtraFields = _extraFieldDataAccess.GetExtraFieldsById(importMode);
@@ -108,6 +131,7 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_ExtraFields", recordExtraFields);
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
         public IActionResult UpdateExtraFields(RecordExtraField record)
         {
             try
@@ -121,6 +145,51 @@ namespace CarCareTracker.Controllers
             var recordExtraFields = _extraFieldDataAccess.GetExtraFieldsById(record.Id);
             return PartialView("_ExtraFields", recordExtraFields);
         }
+        [HttpPost]
+        public IActionResult GenerateTokenForUser()
+        {
+            try
+            {
+                //get current user email address.
+                var emailAddress = User.FindFirstValue(ClaimTypes.Email);
+                if (!string.IsNullOrWhiteSpace(emailAddress))
+                {
+                    var result = _loginLogic.GenerateTokenForEmailAddress(emailAddress, false);
+                    return Json(result);
+                }
+                return Json(false);
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return Json(false);
+            }
+        }
+        [HttpPost]
+        public IActionResult UpdateUserAccount(LoginModel userAccount)
+        {
+            try
+            {
+                var userId = GetUserID();
+                if (userId > 0)
+                {
+                    var result = _loginLogic.UpdateUserDetails(userId, userAccount);
+                    return Json(result);
+                }
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage});
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+            }
+        }
+        [HttpGet]
+        public IActionResult GetUserAccountInformationModal()
+        {
+            var emailAddress = User.FindFirstValue(ClaimTypes.Email);
+            var userName = User.Identity.Name;
+            return PartialView("_AccountModal", new UserData() { EmailAddress = emailAddress, UserName = userName });
+        }
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {

Controllers/LoginController.cs

@@ -4,9 +4,7 @@ using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Mvc;
-using System.Net;
-using System.Security.Cryptography;
-using System.Text;
+using System.IdentityModel.Tokens.Jwt;
 using System.Text.Json;
 
 namespace CarCareTracker.Controllers
@@ -15,19 +13,34 @@ namespace CarCareTracker.Controllers
     {
         private IDataProtector _dataProtector;
         private ILoginLogic _loginLogic;
+        private IConfigHelper _config;
         private readonly ILogger<LoginController> _logger;
         public LoginController(
             ILogger<LoginController> logger,
             IDataProtectionProvider securityProvider,
-            ILoginLogic loginLogic
-            ) 
+            ILoginLogic loginLogic,
+            IConfigHelper config
+            )
         {
             _dataProtector = securityProvider.CreateProtector("login");
             _logger = logger;
             _loginLogic = loginLogic;
+            _config = config;
         }
         public IActionResult Index(string redirectURL = "")
         {
+            var remoteAuthConfig = _config.GetOpenIDConfig();
+            if (remoteAuthConfig.DisableRegularLogin && !string.IsNullOrWhiteSpace(remoteAuthConfig.LogOutURL))
+            {
+                var generatedState = Guid.NewGuid().ToString().Substring(0, 8);
+                remoteAuthConfig.State = generatedState;
+                if (remoteAuthConfig.ValidateState)
+                {
+                    Response.Cookies.Append("OIDC_STATE", remoteAuthConfig.State, new CookieOptions { Expires = new DateTimeOffset(DateTime.Now.AddMinutes(5)) });
+                }
+                var remoteAuthURL = remoteAuthConfig.RemoteAuthURL;
+                return Redirect(remoteAuthURL);
+            }
             return View(model: redirectURL);
         }
         public IActionResult Registration()
@@ -42,6 +55,100 @@ namespace CarCareTracker.Controllers
         {
             return View();
         }
+        public IActionResult GetRemoteLoginLink()
+        {
+            var remoteAuthConfig = _config.GetOpenIDConfig();
+            var generatedState = Guid.NewGuid().ToString().Substring(0, 8);
+            remoteAuthConfig.State = generatedState;
+            if (remoteAuthConfig.ValidateState)
+            {
+                Response.Cookies.Append("OIDC_STATE", remoteAuthConfig.State, new CookieOptions { Expires = new DateTimeOffset(DateTime.Now.AddMinutes(5)) });
+            }
+            var remoteAuthURL = remoteAuthConfig.RemoteAuthURL;
+            return Json(remoteAuthURL);
+        }
+        public async Task<IActionResult> RemoteAuth(string code, string state = "")
+        {
+            try
+            {
+                if (!string.IsNullOrWhiteSpace(code))
+                {
+                    //received code from OIDC provider
+                    //create http client to retrieve user token from OIDC
+                    var httpClient = new HttpClient();
+                    var openIdConfig = _config.GetOpenIDConfig();
+                    //check if validate state is enabled.
+                    if (openIdConfig.ValidateState)
+                    {
+                        var storedStateValue = Request.Cookies["OIDC_STATE"];
+                        if (!string.IsNullOrWhiteSpace(storedStateValue))
+                        {
+                            Response.Cookies.Delete("OIDC_STATE");
+                        }
+                        if (string.IsNullOrWhiteSpace(storedStateValue) || string.IsNullOrWhiteSpace(state) || storedStateValue != state)
+                        {
+                            _logger.LogInformation("Failed OIDC State Validation - Try disabling state validation if you are confident this is not a malicious attempt.");
+                            return new RedirectResult("/Login");
+                        }
+                    }
+                    var httpParams = new List<KeyValuePair<string, string>>
+                {
+                     new KeyValuePair<string, string>("code", code),
+                     new KeyValuePair<string, string>("grant_type", "authorization_code"),
+                     new KeyValuePair<string, string>("client_id", openIdConfig.ClientId),
+                     new KeyValuePair<string, string>("client_secret", openIdConfig.ClientSecret),
+                     new KeyValuePair<string, string>("redirect_uri", openIdConfig.RedirectURL)
+                };
+                    var httpRequest = new HttpRequestMessage(HttpMethod.Post, openIdConfig.TokenURL)
+                    {
+                        Content = new FormUrlEncodedContent(httpParams)
+                    };
+                    var tokenResult = await httpClient.SendAsync(httpRequest).Result.Content.ReadAsStringAsync();
+                    var userJwt = JsonSerializer.Deserialize<OpenIDResult>(tokenResult)?.id_token ?? string.Empty;
+                    if (!string.IsNullOrWhiteSpace(userJwt))
+                    {
+                        //validate JWT token
+                        var tokenParser = new JwtSecurityTokenHandler();
+                        var parsedToken = tokenParser.ReadJwtToken(userJwt);
+                        var userEmailAddress = parsedToken.Claims.First(x => x.Type == "email").Value;
+                        if (!string.IsNullOrWhiteSpace(userEmailAddress))
+                        {
+                            var userData = _loginLogic.ValidateOpenIDUser(new LoginModel() { EmailAddress = userEmailAddress });
+                            if (userData.Id != default)
+                            {
+                                AuthCookie authCookie = new AuthCookie
+                                {
+                                    UserData = userData,
+                                    ExpiresOn = DateTime.Now.AddDays(1)
+                                };
+                                var serializedCookie = JsonSerializer.Serialize(authCookie);
+                                var encryptedCookie = _dataProtector.Protect(serializedCookie);
+                                Response.Cookies.Append("ACCESS_TOKEN", encryptedCookie, new CookieOptions { Expires = new DateTimeOffset(authCookie.ExpiresOn) });
+                                return new RedirectResult("/Home");
+                            } else
+                            {
+                                _logger.LogInformation($"User {userEmailAddress} tried to login via OpenID but is not a registered user in LubeLogger.");
+                                return View("OpenIDRegistration", model: userEmailAddress);
+                            }
+                        } else
+                        {
+                            _logger.LogInformation("OpenID Provider did not provide a valid email address for the user");
+                        }
+                    } else
+                    {
+                        _logger.LogInformation("OpenID Provider did not provide a valid id_token");
+                    }
+                } else
+                {
+                    _logger.LogInformation("OpenID Provider did not provide a code.");
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new RedirectResult("/Login");
+            }
+            return new RedirectResult("/Login");
+        }
         [HttpPost]
         public IActionResult Login(LoginModel credentials)
         {
@@ -81,6 +188,27 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [HttpPost]
+        public IActionResult RegisterOpenIdUser(LoginModel credentials)
+        {
+            var result = _loginLogic.RegisterOpenIdUser(credentials);
+            if (result.Success)
+            {
+                var userData = _loginLogic.ValidateOpenIDUser(new LoginModel() { EmailAddress = credentials.EmailAddress });
+                if (userData.Id != default)
+                {
+                    AuthCookie authCookie = new AuthCookie
+                    {
+                        UserData = userData,
+                        ExpiresOn = DateTime.Now.AddDays(1)
+                    };
+                    var serializedCookie = JsonSerializer.Serialize(authCookie);
+                    var encryptedCookie = _dataProtector.Protect(serializedCookie);
+                    Response.Cookies.Append("ACCESS_TOKEN", encryptedCookie, new CookieOptions { Expires = new DateTimeOffset(authCookie.ExpiresOn) });
+                }
+            }
+            return Json(result);
+        }
+        [HttpPost]
         public IActionResult RequestResetPassword(LoginModel credentials)
         {
             var result = _loginLogic.RequestResetPassword(credentials);
@@ -132,7 +260,12 @@ namespace CarCareTracker.Controllers
         public IActionResult LogOut()
         {
             Response.Cookies.Delete("ACCESS_TOKEN");
-            return Json(true);
+            var remoteAuthConfig = _config.GetOpenIDConfig();
+            if (remoteAuthConfig.DisableRegularLogin && !string.IsNullOrWhiteSpace(remoteAuthConfig.LogOutURL))
+            {
+                return Json(remoteAuthConfig.LogOutURL);
+            }
+            return Json("/Login");
         }
     }
 }

Controllers/MigrationController.cs

@@ -1,13 +1,10 @@
-using CarCareTracker.External.Implementations;
-using CarCareTracker.Helper;
+using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Npgsql;
-using System.Data.Common;
 using System.IO.Compression;
-using System.Xml.Linq;
 
 namespace CarCareTracker.Controllers
 {

Enum/ImportMode.cs

@@ -12,6 +12,7 @@
         SupplyRecord = 7,
         Dashboard = 8,
         PlanRecord = 9,
-        OdometerRecord = 10
+        OdometerRecord = 10,
+        VehicleRecord = 11
     }
 }

External/Implementations/Litedb/CollisionRecordDataAccess.cs

@@ -7,51 +7,48 @@ namespace CarCareTracker.External.Implementations
 {
     public class CollisionRecordDataAccess : ICollisionRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "collisionrecords";
+        public CollisionRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<CollisionRecord> GetCollisionRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                var collisionRecords = table.Find(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
-                return collisionRecords.ToList() ?? new List<CollisionRecord>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            var collisionRecords = table.Find(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
+            return collisionRecords.ToList() ?? new List<CollisionRecord>();
         }
         public CollisionRecord GetCollisionRecordById(int collisionRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                return table.FindById(collisionRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            return table.FindById(collisionRecordId);
         }
         public bool DeleteCollisionRecordById(int collisionRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                table.Delete(collisionRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            table.Delete(collisionRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveCollisionRecordToVehicle(CollisionRecord collisionRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                table.Upsert(collisionRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            table.Upsert(collisionRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllCollisionRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                var collisionRecords = table.DeleteMany(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            var collisionRecords = table.DeleteMany(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/ExtraFieldDataAccess.cs

@@ -1,30 +1,30 @@
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
-using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class ExtraFieldDataAccess: IExtraFieldDataAccess
+    public class ExtraFieldDataAccess : IExtraFieldDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "extrafields";
+        public ExtraFieldDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public RecordExtraField GetExtraFieldsById(int importMode)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<RecordExtraField>(tableName);
-                return table.FindById(importMode) ?? new RecordExtraField();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<RecordExtraField>(tableName);
+            return table.FindById(importMode) ?? new RecordExtraField();
         }
         public bool SaveExtraFields(RecordExtraField record)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<RecordExtraField>(tableName);
-                table.Upsert(record);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<RecordExtraField>(tableName);
+            table.Upsert(record);
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/GasRecordDataAccess.cs

@@ -5,53 +5,50 @@ using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class GasRecordDataAccess: IGasRecordDataAccess
+    public class GasRecordDataAccess : IGasRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "gasrecords";
+        public GasRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<GasRecord> GetGasRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                var gasRecords = table.Find(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
-                return gasRecords.ToList() ?? new List<GasRecord>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<GasRecord>(tableName);
+            var gasRecords = table.Find(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
+            return gasRecords.ToList() ?? new List<GasRecord>();
         }
         public GasRecord GetGasRecordById(int gasRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                return table.FindById(gasRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<GasRecord>(tableName);
+            return table.FindById(gasRecordId);
         }
         public bool DeleteGasRecordById(int gasRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                table.Delete(gasRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<GasRecord>(tableName);
+            table.Delete(gasRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveGasRecordToVehicle(GasRecord gasRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                table.Upsert(gasRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<GasRecord>(tableName);
+            table.Upsert(gasRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllGasRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                var gasRecords = table.DeleteMany(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<GasRecord>(tableName);
+            var gasRecords = table.DeleteMany(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/NoteDataAccess.cs

@@ -1,57 +1,54 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
+using CarCareTracker.Helper;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class NoteDataAccess: INoteDataAccess
+    public class NoteDataAccess : INoteDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "notes";
+        public NoteDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<Note> GetNotesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                var noteToReturn = table.Find(Query.EQ(nameof(Note.VehicleId), vehicleId));
-                return noteToReturn.ToList() ?? new List<Note>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Note>(tableName);
+            var noteToReturn = table.Find(Query.EQ(nameof(Note.VehicleId), vehicleId));
+            return noteToReturn.ToList() ?? new List<Note>();
         }
         public Note GetNoteById(int noteId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                return table.FindById(noteId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Note>(tableName);
+            return table.FindById(noteId);
         }
         public bool SaveNoteToVehicle(Note note)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                table.Upsert(note);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Note>(tableName);
+            table.Upsert(note);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteNoteById(int noteId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                table.Delete(noteId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Note>(tableName);
+            table.Delete(noteId);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllNotesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                var notes = table.DeleteMany(Query.EQ(nameof(Note.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Note>(tableName);
+            var notes = table.DeleteMany(Query.EQ(nameof(Note.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/OdometerRecordDataAccess.cs

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

External/Implementations/Litedb/PlanRecordDataAccess.cs

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

External/Implementations/Litedb/PlanRecordTemplateDataAccess.cs

@@ -1,57 +1,54 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
+using CarCareTracker.Helper;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
     public class PlanRecordTemplateDataAccess : IPlanRecordTemplateDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "planrecordtemplates";
+        public PlanRecordTemplateDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<PlanRecordInput> GetPlanRecordTemplatesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                var planRecords = table.Find(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
-                return planRecords.ToList() ?? new List<PlanRecordInput>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            var planRecords = table.Find(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
+            return planRecords.ToList() ?? new List<PlanRecordInput>();
         }
         public PlanRecordInput GetPlanRecordTemplateById(int planRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                return table.FindById(planRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            return table.FindById(planRecordId);
         }
         public bool DeletePlanRecordTemplateById(int planRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                table.Delete(planRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            table.Delete(planRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SavePlanRecordTemplateToVehicle(PlanRecordInput planRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                table.Upsert(planRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            table.Upsert(planRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllPlanRecordTemplatesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<PlanRecord>(tableName);
+            var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/ReminderRecordDataAccess.cs

@@ -1,57 +1,54 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
+using CarCareTracker.Helper;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
     public class ReminderRecordDataAccess : IReminderRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "reminderrecords";
+        public ReminderRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<ReminderRecord> GetReminderRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                var reminderRecords = table.Find(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
-                return reminderRecords.ToList() ?? new List<ReminderRecord>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            var reminderRecords = table.Find(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
+            return reminderRecords.ToList() ?? new List<ReminderRecord>();
         }
         public ReminderRecord GetReminderRecordById(int reminderRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                return table.FindById(reminderRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            return table.FindById(reminderRecordId);
         }
         public bool DeleteReminderRecordById(int reminderRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                table.Delete(reminderRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            table.Delete(reminderRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveReminderRecordToVehicle(ReminderRecord reminderRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                table.Upsert(reminderRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            table.Upsert(reminderRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllReminderRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                var reminderRecords = table.DeleteMany(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            var reminderRecords = table.DeleteMany(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/ServiceRecordDataAccess.cs

@@ -1,57 +1,54 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
+using CarCareTracker.Helper;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class ServiceRecordDataAccess: IServiceRecordDataAccess
+    public class ServiceRecordDataAccess : IServiceRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "servicerecords";
+        public ServiceRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<ServiceRecord> GetServiceRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                var serviceRecords = table.Find(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
-                return serviceRecords.ToList() ?? new List<ServiceRecord>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            var serviceRecords = table.Find(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
+            return serviceRecords.ToList() ?? new List<ServiceRecord>();
         }
         public ServiceRecord GetServiceRecordById(int serviceRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                return table.FindById(serviceRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            return table.FindById(serviceRecordId);
         }
         public bool DeleteServiceRecordById(int serviceRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                table.Delete(serviceRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            table.Delete(serviceRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveServiceRecordToVehicle(ServiceRecord serviceRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                table.Upsert(serviceRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            table.Upsert(serviceRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllServiceRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                var serviceRecords = table.DeleteMany(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            var serviceRecords = table.DeleteMany(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/SupplyRecordDataAccess.cs

@@ -7,51 +7,48 @@ namespace CarCareTracker.External.Implementations
 {
     public class SupplyRecordDataAccess : ISupplyRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "supplyrecords";
+        public SupplyRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         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>();
-            };
+            var db = _liteDB.GetLiteDB();
+            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);
-            };
+            var db = _liteDB.GetLiteDB();
+            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;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            table.Delete(supplyRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<SupplyRecord>(tableName);
-                table.Upsert(supplyRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            table.Upsert(supplyRecord);
+            db.Checkpoint();
+            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;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            var supplyRecords = table.DeleteMany(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/TaxRecordDataAccess.cs

@@ -1,57 +1,54 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
+using CarCareTracker.Helper;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
     public class TaxRecordDataAccess : ITaxRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "taxrecords";
+        public TaxRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<TaxRecord> GetTaxRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                var taxRecords = table.Find(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
-                return taxRecords.ToList() ?? new List<TaxRecord>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<TaxRecord>(tableName);
+            var taxRecords = table.Find(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
+            return taxRecords.ToList() ?? new List<TaxRecord>();
         }
         public TaxRecord GetTaxRecordById(int taxRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                return table.FindById(taxRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<TaxRecord>(tableName);
+            return table.FindById(taxRecordId);
         }
         public bool DeleteTaxRecordById(int taxRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                table.Delete(taxRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<TaxRecord>(tableName);
+            table.Delete(taxRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveTaxRecordToVehicle(TaxRecord taxRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                table.Upsert(taxRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<TaxRecord>(tableName);
+            table.Upsert(taxRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllTaxRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                var taxRecords = table.DeleteMany(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<TaxRecord>(tableName);
+            var taxRecords = table.DeleteMany(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/TokenRecordDataAccess.cs

@@ -7,51 +7,47 @@ namespace CarCareTracker.External.Implementations
 {
     public class TokenRecordDataAccess : ITokenRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "tokenrecords";
+        public TokenRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<Token> GetTokens()
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                return table.FindAll().ToList();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Token>(tableName);
+            return table.FindAll().ToList();
         }
         public Token GetTokenRecordByBody(string tokenBody)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.Body), tokenBody));
-                return tokenRecord ?? new Token();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Token>(tableName);
+            var tokenRecord = table.FindOne(Query.EQ(nameof(Token.Body), tokenBody));
+            return tokenRecord ?? new Token();
         }
         public Token GetTokenRecordByEmailAddress(string emailAddress)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.EmailAddress), emailAddress));
-                return tokenRecord ?? new Token();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Token>(tableName);
+            var tokenRecord = table.FindOne(Query.EQ(nameof(Token.EmailAddress), emailAddress));
+            return tokenRecord ?? new Token();
         }
         public bool CreateNewToken(Token token)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                table.Insert(token);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Token>(tableName);
+            table.Insert(token);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteToken(int tokenId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                table.Delete(tokenId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Token>(tableName);
+            table.Delete(tokenId);
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/UpgradeRecordDataAccess.cs

@@ -7,51 +7,48 @@ namespace CarCareTracker.External.Implementations
 {
     public class UpgradeRecordDataAccess : IUpgradeRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
+        public UpgradeRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         private static string tableName = "upgraderecords";
         public List<UpgradeRecord> GetUpgradeRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                var upgradeRecords = table.Find(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
-                return upgradeRecords.ToList() ?? new List<UpgradeRecord>();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            var upgradeRecords = table.Find(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
+            return upgradeRecords.ToList() ?? new List<UpgradeRecord>();
         }
         public UpgradeRecord GetUpgradeRecordById(int upgradeRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                return table.FindById(upgradeRecordId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            return table.FindById(upgradeRecordId);
         }
         public bool DeleteUpgradeRecordById(int upgradeRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                table.Delete(upgradeRecordId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            table.Delete(upgradeRecordId);
+            db.Checkpoint();
+            return true;
         }
         public bool SaveUpgradeRecordToVehicle(UpgradeRecord upgradeRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                table.Upsert(upgradeRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            table.Upsert(upgradeRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteAllUpgradeRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                var upgradeRecords = table.DeleteMany(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            var upgradeRecords = table.DeleteMany(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/UserAccessDataAcces.cs

@@ -7,8 +7,12 @@ namespace CarCareTracker.External.Implementations
 {
     public class UserAccessDataAccess : IUserAccessDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "useraccessrecords";
+        public UserAccessDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         /// <summary>
         /// Gets a list of vehicles user have access to.
         /// </summary>
@@ -16,45 +20,37 @@ namespace CarCareTracker.External.Implementations
         /// <returns></returns>
         public List<UserAccess> GetUserAccessByUserId(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                return table.Find(x=>x.Id.UserId == userId).ToList();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            return table.Find(x => x.Id.UserId == userId).ToList();
         }
         public UserAccess GetUserAccessByVehicleAndUserId(int userId, int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                return table.Find(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId).FirstOrDefault();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            return table.Find(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId).FirstOrDefault();
         }
         public List<UserAccess> GetUserAccessByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                return table.Find(x => x.Id.VehicleId == vehicleId).ToList();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            return table.Find(x => x.Id.VehicleId == vehicleId).ToList();
         }
         public bool SaveUserAccess(UserAccess userAccess)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.Upsert(userAccess);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.Upsert(userAccess);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteUserAccess(int userId, int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.DeleteMany(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.DeleteMany(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId);
+            db.Checkpoint();
+            return true;
         }
         /// <summary>
         /// Delete all access records when a vehicle is deleted.
@@ -63,12 +59,11 @@ namespace CarCareTracker.External.Implementations
         /// <returns></returns>
         public bool DeleteAllAccessRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.DeleteMany(x=>x.Id.VehicleId == vehicleId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.DeleteMany(x => x.Id.VehicleId == vehicleId);
+            db.Checkpoint();
+            return true;
         }
         /// <summary>
         /// Delee all access records when a user is deleted.
@@ -77,12 +72,11 @@ namespace CarCareTracker.External.Implementations
         /// <returns></returns>
         public bool DeleteAllAccessRecordsByUserId(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.DeleteMany(x => x.Id.UserId == userId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.DeleteMany(x => x.Id.UserId == userId);
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/UserConfigDataAccess.cs

@@ -1,39 +1,38 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
-using LiteDB;
+using CarCareTracker.Helper;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class UserConfigDataAccess: IUserConfigDataAccess
+    public class UserConfigDataAccess : IUserConfigDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "userconfigrecords";
+        public UserConfigDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public UserConfigData GetUserConfig(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserConfigData>(tableName);
-                return table.FindById(userId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserConfigData>(tableName);
+            return table.FindById(userId);
         }
         public bool SaveUserConfig(UserConfigData userConfigData)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserConfigData>(tableName);
-                table.Upsert(userConfigData);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserConfigData>(tableName);
+            table.Upsert(userConfigData);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteUserConfig(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserConfigData>(tableName);
-                table.Delete(userId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserConfigData>(tableName);
+            table.Delete(userId);
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/UserRecordDataAccess.cs

@@ -1,66 +1,60 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
+using CarCareTracker.Helper;
 
 namespace CarCareTracker.External.Implementations
 {
     public class UserRecordDataAccess : IUserRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "userrecords";
+        public UserRecordDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public List<UserData> GetUsers()
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                return table.FindAll().ToList();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserData>(tableName);
+            return table.FindAll().ToList();
         }
         public UserData GetUserRecordByUserName(string userName)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                var userRecord = table.FindOne(Query.EQ(nameof(UserData.UserName), userName));
-                return userRecord ?? new UserData();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserData>(tableName);
+            var userRecord = table.FindOne(Query.EQ(nameof(UserData.UserName), userName));
+            return userRecord ?? new UserData();
         }
         public UserData GetUserRecordByEmailAddress(string emailAddress)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                var userRecord = table.FindOne(Query.EQ(nameof(UserData.EmailAddress), emailAddress));
-                return userRecord ?? new UserData();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserData>(tableName);
+            var userRecord = table.FindOne(Query.EQ(nameof(UserData.EmailAddress), emailAddress));
+            return userRecord ?? new UserData();
         }
         public UserData GetUserRecordById(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                var userRecord = table.FindById(userId);
-                return userRecord ?? new UserData();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserData>(tableName);
+            var userRecord = table.FindById(userId);
+            return userRecord ?? new UserData();
         }
         public bool SaveUserRecord(UserData userRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                table.Upsert(userRecord);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserData>(tableName);
+            table.Upsert(userRecord);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteUserRecord(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                table.Delete(userId);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<UserData>(tableName);
+            table.Delete(userId);
+            db.Checkpoint();
+            return true;
         }
     }
 }

External/Implementations/Litedb/VehicleDataAccess.cs

@@ -5,42 +5,41 @@ using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class VehicleDataAccess: IVehicleDataAccess
+    public class VehicleDataAccess : IVehicleDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private ILiteDBHelper _liteDB { get; set; }
         private static string tableName = "vehicles";
+        public VehicleDataAccess(ILiteDBHelper liteDB)
+        {
+           _liteDB = liteDB;
+        }
         public bool SaveVehicle(Vehicle vehicle)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                var result = table.Upsert(vehicle);
-                return true;
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Vehicle>(tableName);
+            var result = table.Upsert(vehicle);
+            db.Checkpoint();
+            return true;
         }
         public bool DeleteVehicle(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                return table.Delete(vehicleId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Vehicle>(tableName);
+            var result = table.Delete(vehicleId);
+            db.Checkpoint();
+            return result;
         }
         public List<Vehicle> GetVehicles()
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                return table.FindAll().ToList();
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Vehicle>(tableName);
+            return table.FindAll().ToList();
         }
         public Vehicle GetVehicleById(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                return table.FindById(vehicleId);
-            };
+            var db = _liteDB.GetLiteDB();
+            var table = db.GetCollection<Vehicle>(tableName);
+            return table.FindById(vehicleId);
         }
     }
 }

External/Implementations/Postgres/ExtraFieldDataAccess.cs

@@ -58,11 +58,7 @@ namespace CarCareTracker.External.Implementations
             try
             {
                 var existingRecord = GetExtraFieldsById(record.Id);
-                string cmd = $"INSERT INTO app.{tableName} (id, data) VALUES(@id, CAST(@data AS jsonb))";
-                if (existingRecord.ExtraFields != null)
-                {
-                    cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
-                }
+                string cmd = $"INSERT INTO app.{tableName} (id, data) VALUES(@id, CAST(@data AS jsonb)) ON CONFLICT(id) DO UPDATE SET data = CAST(@data AS jsonb)";
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", record.Id);

Helper/ConfigHelper.cs

@@ -7,12 +7,18 @@ namespace CarCareTracker.Helper
 {
     public interface IConfigHelper
     {
+        OpenIDConfig GetOpenIDConfig();
+        ReminderUrgencyConfig GetReminderUrgencyConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
+        bool AuthenticateRootUser(string username, string password);
+        string GetWebHookUrl();
+        string GetMOTD();
         string GetLogoUrl();
         string GetServerLanguage();
         bool GetServerEnableShopSupplies();
         string GetServerPostgresConnection();
+        string GetAllowedFileUploadExtensions();
         public bool DeleteUserConfig(int userId);
     }
     public class ConfigHelper : IConfigHelper
@@ -28,6 +34,34 @@ namespace CarCareTracker.Helper
             _userConfig = userConfig;
             _cache = memoryCache;
         }
+        public string GetWebHookUrl()
+        {
+            var webhook = _config["LUBELOGGER_WEBHOOK"];
+            if (string.IsNullOrWhiteSpace(webhook))
+            {
+                webhook = "";
+            }
+            return webhook;
+        }
+        public string GetMOTD()
+        {
+            var motd = _config["LUBELOGGER_MOTD"];
+            if (string.IsNullOrWhiteSpace(motd))
+            {
+                motd = "";
+            }
+            return motd;
+        }
+        public OpenIDConfig GetOpenIDConfig()
+        {
+            OpenIDConfig openIdConfig = _config.GetSection("OpenIDConfig").Get<OpenIDConfig>() ?? new OpenIDConfig();
+            return openIdConfig;
+        }
+        public ReminderUrgencyConfig GetReminderUrgencyConfig()
+        {
+            ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig();
+            return reminderUrgencyConfig;
+        }
         public string GetLogoUrl()
         {
             var logoUrl = _config["LUBELOGGER_LOGO_URL"];
@@ -37,6 +71,24 @@ namespace CarCareTracker.Helper
             }
             return logoUrl;
         }
+        public string GetAllowedFileUploadExtensions()
+        {
+            var allowedFileExtensions = _config["LUBELOGGER_ALLOWED_FILE_EXTENSIONS"];
+            if (string.IsNullOrWhiteSpace(allowedFileExtensions)){
+                return StaticHelper.DefaultAllowedFileExtensions;
+            }
+            return allowedFileExtensions;
+        }
+        public bool AuthenticateRootUser(string username, string password)
+        {
+            var rootUsername = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty;
+            var rootPassword = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty;
+            if (string.IsNullOrWhiteSpace(rootUsername) || string.IsNullOrWhiteSpace(rootPassword))
+            {
+                return false;
+            }
+            return username == rootUsername && password == rootPassword;
+        }
         public string GetServerLanguage()
         {
             var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
@@ -75,20 +127,9 @@ namespace CarCareTracker.Helper
                         File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(new UserConfig()));
                     }
                     var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
-                    var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents);
-                    if (existingUserConfig is not null)
-                    {
-                        //copy over settings that are off limits on the settings page.
-                        configData.EnableAuth = existingUserConfig.EnableAuth;
-                        configData.UserNameHash = existingUserConfig.UserNameHash;
-                        configData.UserPasswordHash = existingUserConfig.UserPasswordHash;
-                    }
-                    else
-                    {
-                        configData.EnableAuth = false;
-                        configData.UserNameHash = string.Empty;
-                        configData.UserPasswordHash = string.Empty;
-                    }
+                    configData.EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)] ?? "false");
+                    configData.UserNameHash = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty;
+                    configData.UserPasswordHash = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty;
                     File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(configData));
                     _cache.Set<UserConfig>($"userConfig_{userId}", configData);
                     return true;
@@ -133,8 +174,12 @@ namespace CarCareTracker.Helper
                 PreferredGasMileageUnit = _config[nameof(UserConfig.PreferredGasMileageUnit)],
                 PreferredGasUnit = _config[nameof(UserConfig.PreferredGasUnit)],
                 UserLanguage = _config[nameof(UserConfig.UserLanguage)],
+                HideSoldVehicles = bool.Parse(_config[nameof(UserConfig.HideSoldVehicles)]),
                 EnableShopSupplies = bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)]),
-                VisibleTabs = _config.GetSection("VisibleTabs").Get<List<ImportMode>>(),
+                EnableExtraFieldColumns = bool.Parse(_config[nameof(UserConfig.EnableExtraFieldColumns)]),
+                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>(),
+                UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
+                ReminderUrgencyConfig = _config.GetSection(nameof(UserConfig.ReminderUrgencyConfig)).Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(),
                 DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
             };
             int userId = 0;

Helper/FileHelper.cs

@@ -18,10 +18,12 @@ namespace CarCareTracker.Helper
     {
         private readonly IWebHostEnvironment _webEnv;
         private readonly ILogger<IFileHelper> _logger;
-        public FileHelper(IWebHostEnvironment webEnv, ILogger<IFileHelper> logger)
+        private ILiteDBHelper _liteDB;
+        public FileHelper(IWebHostEnvironment webEnv, ILogger<IFileHelper> logger, ILiteDBHelper liteDB)
         {
             _webEnv = webEnv;
             _logger = logger;
+            _liteDB = liteDB;
         }
         public List<string> GetLanguages()
         {
@@ -93,6 +95,7 @@ namespace CarCareTracker.Helper
                 //copy over images and documents.
                 var imagePath = Path.Combine(tempPath, "images");
                 var documentPath = Path.Combine(tempPath, "documents");
+                var translationPath = Path.Combine(tempPath, "translations");
                 var dataPath = Path.Combine(tempPath, StaticHelper.DbName);
                 var configPath = Path.Combine(tempPath, StaticHelper.UserConfigPath);
                 if (Directory.Exists(imagePath))
@@ -139,8 +142,32 @@ namespace CarCareTracker.Helper
                         File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}", true);
                     }
                 }
+                if (Directory.Exists(translationPath))
+                {
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "translations");
+                    if (!Directory.Exists(existingPath))
+                    {
+                        Directory.CreateDirectory(existingPath);
+                    }
+                    else if (clearExisting)
+                    {
+                        var filesToDelete = Directory.GetFiles(existingPath);
+                        foreach (string file in filesToDelete)
+                        {
+                            File.Delete(file);
+                        }
+                    }
+                    //copy each files from temp folder to newPath
+                    var filesToUpload = Directory.GetFiles(translationPath);
+                    foreach (string file in filesToUpload)
+                    {
+                        File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}", true);
+                    }
+                }
                 if (File.Exists(dataPath))
                 {
+                    //Relinquish current DB file lock
+                    _liteDB.DisposeLiteDB();
                     //data path will always exist as it is created on startup if not.
                     File.Move(dataPath, StaticHelper.DbName, true);
                 }
@@ -173,7 +200,7 @@ namespace CarCareTracker.Helper
                 foreach (UploadedFiles file in reportModel.Files)
                 {
                     var fileToCopy = GetFullFilePath(file.Location);
-                    var destFileName = $"{tempPath}/{fileIndex}{Path.GetExtension(file.Location)}";
+                    var destFileName = $"{tempPath}/{fileIndex}_{reportModel.DataType}_{reportModel.Date.ToString("yyyy-MM-dd")}_{file.Name}{Path.GetExtension(file.Location)}";
                     File.Copy(fileToCopy, destFileName);
                     fileIndex++;
                 }
@@ -191,6 +218,7 @@ namespace CarCareTracker.Helper
             var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{folderName}");
             var imagePath = Path.Combine(_webEnv.WebRootPath, "images");
             var documentPath = Path.Combine(_webEnv.WebRootPath, "documents");
+            var translationPath = Path.Combine(_webEnv.WebRootPath, "translations");
             var dataPath = StaticHelper.DbName;
             var configPath = StaticHelper.UserConfigPath;
             if (!Directory.Exists(tempPath))
@@ -215,6 +243,16 @@ namespace CarCareTracker.Helper
                     File.Copy(file, $"{newPath}/{Path.GetFileName(file)}");
                 }
             }
+            if (Directory.Exists(translationPath))
+            {
+                var files = Directory.GetFiles(translationPath);
+                foreach(var file in files)
+                {
+                    var newPath = Path.Combine(tempPath, "translations");
+                    Directory.CreateDirectory(newPath);
+                    File.Copy(file, $"{newPath}/{Path.GetFileName(file)}");
+                }
+            }
             if (File.Exists(dataPath))
             {
                 var newPath = Path.Combine(tempPath, "data");

Helper/GasHelper.cs

@@ -71,7 +71,8 @@ namespace CarCareTracker.Helper
                         IsFillToFull = currentObject.IsFillToFull,
                         MissedFuelUp = currentObject.MissedFuelUp,
                         Notes = currentObject.Notes,
-                        Tags = currentObject.Tags
+                        Tags = currentObject.Tags,
+                        ExtraFields = currentObject.ExtraFields
                     };
                     if (currentObject.MissedFuelUp)
                     {
@@ -124,7 +125,8 @@ namespace CarCareTracker.Helper
                         IsFillToFull = currentObject.IsFillToFull,
                         MissedFuelUp = currentObject.MissedFuelUp,
                         Notes = currentObject.Notes,
-                        Tags = currentObject.Tags
+                        Tags = currentObject.Tags,
+                        ExtraFields = currentObject.ExtraFields
                     });
                 }
                 previousMileage = currentObject.Mileage;

Helper/LiteDBHelper.cs

@@ -0,0 +1,36 @@
+using LiteDB;
+
+namespace CarCareTracker.Helper;
+
+public interface ILiteDBHelper
+{
+    LiteDatabase GetLiteDB();
+    void DisposeLiteDB();
+}
+public class LiteDBHelper: ILiteDBHelper
+{
+    public LiteDatabase db { get; set; }
+    public LiteDBHelper()
+    {
+        if (db == null)
+        {
+            db = new LiteDatabase(StaticHelper.DbName);
+        }
+    }
+    public LiteDatabase GetLiteDB()
+    {
+        if (db == null)
+        {
+            db = new LiteDatabase(StaticHelper.DbName);
+        }
+        return db;
+    }
+    public void DisposeLiteDB()
+    {
+        if (db != null)
+        {
+            db.Dispose();
+            db = null;
+        }
+    }
+}

Helper/MailHelper.cs

@@ -8,6 +8,7 @@ namespace CarCareTracker.Helper
     {
         OperationResponse NotifyUserForRegistration(string emailAddress, string token);
         OperationResponse NotifyUserForPasswordReset(string emailAddress, string token);
+        OperationResponse NotifyUserForAccountUpdate(string emailAddress, string token);
         OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders);
     }
     public class MailHelper : IMailHelper
@@ -64,6 +65,28 @@ namespace CarCareTracker.Helper
                 return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
+        public OperationResponse NotifyUserForAccountUpdate(string emailAddress, string token)
+        {
+            if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
+            {
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+            }
+            if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
+            {
+                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+            }
+            string emailSubject = "Your User Account Update Token for LubeLogger";
+            string emailBody = $"A token has been generated on your behalf, please update your account for LubeLogger using the token: {token}";
+            var result = SendEmail(emailAddress, emailSubject, emailBody);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+            }
+        }
         public OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))

Helper/ReminderHelper.cs

@@ -9,6 +9,11 @@ namespace CarCareTracker.Helper
     }
     public class ReminderHelper: IReminderHelper
     {
+        private readonly IConfigHelper _config;
+        public ReminderHelper(IConfigHelper config)
+        {
+            _config = config;
+        }
         public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder)
         {
             if (existingReminder.Metric == ReminderMetric.Both)
@@ -56,6 +61,7 @@ namespace CarCareTracker.Helper
         public List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare)
         {
             List<ReminderRecordViewModel> reminderViewModels = new List<ReminderRecordViewModel>();
+            var reminderUrgencyConfig = _config.GetReminderUrgencyConfig();
             foreach (var reminder in reminders)
             {
                 var reminderViewModel = new ReminderRecordViewModel()
@@ -81,24 +87,24 @@ namespace CarCareTracker.Helper
                         reminderViewModel.Urgency = ReminderUrgency.PastDue;
                         reminderViewModel.Metric = ReminderMetric.Odometer;
                     }
-                    else if (reminder.Date < dateCompare.AddDays(7))
+                    else if (reminder.Date < dateCompare.AddDays(reminderUrgencyConfig.VeryUrgentDays))
                     {
                         //if less than a week from today or less than 50 miles from current mileage then very urgent.
                         reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
                         //have to specify by which metric this reminder is urgent.
                         reminderViewModel.Metric = ReminderMetric.Date;
                     }
-                    else if (reminder.Mileage < currentMileage + 50)
+                    else if (reminder.Mileage < currentMileage + reminderUrgencyConfig.VeryUrgentDistance)
                     {
                         reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
                         reminderViewModel.Metric = ReminderMetric.Odometer;
                     }
-                    else if (reminder.Date < dateCompare.AddDays(30))
+                    else if (reminder.Date < dateCompare.AddDays(reminderUrgencyConfig.UrgentDays))
                     {
                         reminderViewModel.Urgency = ReminderUrgency.Urgent;
                         reminderViewModel.Metric = ReminderMetric.Date;
                     }
-                    else if (reminder.Mileage < currentMileage + 100)
+                    else if (reminder.Mileage < currentMileage + reminderUrgencyConfig.UrgentDistance)
                     {
                         reminderViewModel.Urgency = ReminderUrgency.Urgent;
                         reminderViewModel.Metric = ReminderMetric.Odometer;
@@ -110,11 +116,11 @@ namespace CarCareTracker.Helper
                     {
                         reminderViewModel.Urgency = ReminderUrgency.PastDue;
                     }
-                    else if (reminder.Date < dateCompare.AddDays(7))
+                    else if (reminder.Date < dateCompare.AddDays(reminderUrgencyConfig.VeryUrgentDays))
                     {
                         reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
                     }
-                    else if (reminder.Date < dateCompare.AddDays(30))
+                    else if (reminder.Date < dateCompare.AddDays(reminderUrgencyConfig.UrgentDays))
                     {
                         reminderViewModel.Urgency = ReminderUrgency.Urgent;
                     }
@@ -126,11 +132,11 @@ namespace CarCareTracker.Helper
                         reminderViewModel.Urgency = ReminderUrgency.PastDue;
                         reminderViewModel.Metric = ReminderMetric.Odometer;
                     }
-                    else if (reminder.Mileage < currentMileage + 50)
+                    else if (reminder.Mileage < currentMileage + reminderUrgencyConfig.VeryUrgentDistance)
                     {
                         reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
                     }
-                    else if (reminder.Mileage < currentMileage + 100)
+                    else if (reminder.Mileage < currentMileage + reminderUrgencyConfig.UrgentDistance)
                     {
                         reminderViewModel.Urgency = ReminderUrgency.Urgent;
                     }

Helper/ReportHelper.cs

@@ -5,6 +5,7 @@ namespace CarCareTracker.Helper
 {
     public interface IReportHelper
     {
+        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0);
         IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0);
         IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0);
         IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0);
@@ -13,6 +14,20 @@ namespace CarCareTracker.Helper
     }
     public class ReportHelper: IReportHelper
     {
+        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                odometerRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = 0,
+                DistanceTraveled = x.Sum(y=>y.DistanceTraveled)
+            });
+        }
         public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
         {
             if (year != default)

Helper/StaticHelper.cs

@@ -1,6 +1,5 @@
 using CarCareTracker.Models;
 using System.Globalization;
-using System.Linq;
 
 namespace CarCareTracker.Helper
 {
@@ -9,10 +8,12 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
+        public static string VersionNumber = "1.2.8";
         public static string DbName = "data/cartracker.db";
         public static string UserConfigPath = "config/userConfig.json";
         public static string GenericErrorMessage = "An error occurred, please try again later";
         public static string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
+        public static string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
 
         public static string GetTitleCaseReminderUrgency(ReminderUrgency input)
         {
@@ -130,7 +131,8 @@ namespace CarCareTracker.Helper
                 Files = input.Files,
                 Notes = input.Notes,
                 Tags = input.Tags,
-                ExtraFields = input.ExtraFields
+                ExtraFields = input.ExtraFields,
+                RequisitionHistory = input.RequisitionHistory
             };
         }
         public static CollisionRecord GenericToRepairRecord(GenericRecord input)
@@ -145,7 +147,8 @@ namespace CarCareTracker.Helper
                 Files = input.Files,
                 Notes = input.Notes,
                 Tags = input.Tags,
-                ExtraFields = input.ExtraFields
+                ExtraFields = input.ExtraFields,
+                RequisitionHistory = input.RequisitionHistory
             };
         }
         public static UpgradeRecord GenericToUpgradeRecord(GenericRecord input)
@@ -160,7 +163,8 @@ namespace CarCareTracker.Helper
                 Files = input.Files,
                 Notes = input.Notes,
                 Tags = input.Tags,
-                ExtraFields = input.ExtraFields
+                ExtraFields = input.ExtraFields,
+                RequisitionHistory = input.RequisitionHistory
             };
         }
 
@@ -180,11 +184,20 @@ namespace CarCareTracker.Helper
             {
                 return templateExtraFields;
             }
-            //append the fields.
+            var recordFieldNames = recordExtraFields.Select(x => x.Name);
+            //update isrequired setting
             foreach (ExtraField extraField in recordExtraFields)
             {
                 extraField.IsRequired = templateExtraFields.Where(x => x.Name == extraField.Name).First().IsRequired;
             }
+            //append extra fields
+            foreach(ExtraField extraField in templateExtraFields)
+            {
+                if (!recordFieldNames.Contains(extraField.Name))
+                {
+                    recordExtraFields.Add(extraField);
+                }
+            }
             return recordExtraFields;
         }
 
@@ -210,5 +223,41 @@ namespace CarCareTracker.Helper
             }
             return fuelEconomyUnit;
         }
+        public static long GetEpochFromDateTime(DateTime date)
+        {
+            return new DateTimeOffset(date).ToUnixTimeMilliseconds();
+        }
+        public static void InitMessage(IConfiguration config)
+        {
+            Console.WriteLine($"LubeLogger {VersionNumber}");
+            Console.WriteLine("Website: https://lubelogger.com");
+            Console.WriteLine("Documentation: https://docs.lubelogger.com");
+            Console.WriteLine("GitHub: https://github.com/hargata/lubelog");
+            var mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
+            if (mailConfig != null && !string.IsNullOrWhiteSpace(mailConfig.EmailServer))
+            {
+                Console.WriteLine($"SMTP Configured for {mailConfig.EmailServer}");
+            } else
+            {
+                Console.WriteLine("SMTP Not Configured");
+            }
+            var motd = config["LUBELOGGER_MOTD"] ?? "Not Configured";
+            Console.WriteLine($"Message Of The Day: {motd}");
+        }
+        public static async void NotifyAsync(string webhookURL, int vehicleId, string username, string action)
+        {
+            if (string.IsNullOrWhiteSpace(webhookURL))
+            {
+                return;
+            }
+            var httpClient = new HttpClient();
+            var httpParams = new Dictionary<string, string>
+                {
+                { "vehicleId", vehicleId.ToString() },
+                     { "username", username },
+                     { "action", action },
+                };
+            httpClient.PostAsJsonAsync(webhookURL, httpParams);
+        }
     }
 }

Helper/TranslationHelper.cs

@@ -1,5 +1,4 @@
-using CarCareTracker.Models;
-using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Caching.Memory;
 using System.Text.Json;
 
 namespace CarCareTracker.Helper

Logic/LoginLogic.cs

@@ -2,8 +2,6 @@
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using Microsoft.Extensions.Caching.Memory;
-using System.Net;
-using System.Net.Mail;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
@@ -16,14 +14,18 @@ namespace CarCareTracker.Logic
         OperationResponse GenerateUserToken(string emailAddress, bool autoNotify);
         bool DeleteUserToken(int tokenId);
         bool DeleteUser(int userId);
+        OperationResponse RegisterOpenIdUser(LoginModel credentials);
+        OperationResponse UpdateUserDetails(int userId, LoginModel credentials);
         OperationResponse RegisterNewUser(LoginModel credentials);
         OperationResponse RequestResetPassword(LoginModel credentials);
         OperationResponse ResetPasswordByUser(LoginModel credentials);
         OperationResponse ResetUserPassword(LoginModel credentials);
         UserData ValidateUserCredentials(LoginModel credentials);
+        UserData ValidateOpenIDUser(LoginModel credentials);
         bool CheckIfUserIsValid(int userId);
         bool CreateRootUserCredentials(LoginModel credentials);
         bool DeleteRootUserCredentials();
+        bool GenerateTokenForEmailAddress(string emailAddress, bool isPasswordReset);
         List<UserData> GetAllUsers();
         List<Token> GetAllTokens();
 
@@ -33,15 +35,18 @@ namespace CarCareTracker.Logic
         private readonly IUserRecordDataAccess _userData;
         private readonly ITokenRecordDataAccess _tokenData;
         private readonly IMailHelper _mailHelper;
+        private readonly IConfigHelper _configHelper;
         private IMemoryCache _cache;
         public LoginLogic(IUserRecordDataAccess userData, 
             ITokenRecordDataAccess tokenData, 
             IMailHelper mailHelper,
+            IConfigHelper configHelper,
             IMemoryCache memoryCache)
         {
             _userData = userData;
             _tokenData = tokenData;
             _mailHelper = mailHelper;
+            _configHelper = configHelper;
             _cache = memoryCache;
         }
         public bool CheckIfUserIsValid(int userId)
@@ -59,6 +64,89 @@ namespace CarCareTracker.Logic
                 return result.Id != 0;
             }
         }
+        public OperationResponse UpdateUserDetails(int userId, LoginModel credentials)
+        {
+            //get current user details
+            var existingUser = _userData.GetUserRecordById(userId);
+            if (existingUser.Id == default)
+            {
+                return new OperationResponse { Success = false, Message = "Invalid user" };
+            }
+            //validate user token
+            var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
+            if (existingToken.Id == default || existingToken.EmailAddress != existingUser.EmailAddress)
+            {
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
+            }
+            if (!string.IsNullOrWhiteSpace(credentials.UserName) && existingUser.UserName != credentials.UserName)
+            {
+                //check if new username is already taken.
+                var existingUserWithUserName = _userData.GetUserRecordByUserName(credentials.UserName);
+                if (existingUserWithUserName.Id != default)
+                {
+                    return new OperationResponse { Success = false, Message = "Username already taken" };
+                }
+                existingUser.UserName = credentials.UserName;
+            }
+            if (!string.IsNullOrWhiteSpace(credentials.EmailAddress) && existingUser.EmailAddress != credentials.EmailAddress)
+            {
+                //check if email address already exists
+                var existingUserWithEmailAddress = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+                if (existingUserWithEmailAddress.Id != default)
+                {
+                    return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+                }
+                existingUser.EmailAddress = credentials.EmailAddress;
+            }
+            if (!string.IsNullOrWhiteSpace(credentials.Password))
+            {
+                //update password
+                existingUser.Password = GetHash(credentials.Password);
+            }
+            //delete token
+            _tokenData.DeleteToken(existingToken.Id);
+            var result = _userData.SaveUserRecord(existingUser);
+            return new OperationResponse { Success = result, Message = result ? "User Updated" : StaticHelper.GenericErrorMessage };
+        }
+        public OperationResponse RegisterOpenIdUser(LoginModel credentials)
+        {
+            //validate their token.
+            var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
+            if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
+            {
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
+            }
+            if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName))
+            {
+                return new OperationResponse { Success = false, Message = "Username cannot be blank" };
+            }
+            var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
+            if (existingUser.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "Username already taken" };
+            }
+            var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (existingUserWithEmail.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+            }
+            _tokenData.DeleteToken(existingToken.Id);
+            var newUser = new UserData()
+            {
+                UserName = credentials.UserName,
+                Password = GetHash(NewToken()), //generate a password for OpenID User
+                EmailAddress = credentials.EmailAddress
+            };
+            var result = _userData.SaveUserRecord(newUser);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "You will be logged in briefly." };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+            }
+        }
         //handles user registration
         public OperationResponse RegisterNewUser(LoginModel credentials)
         {
@@ -112,21 +200,7 @@ namespace CarCareTracker.Logic
             if (existingUser.Id != default)
             {
                 //user exists, generate a token and send email.
-                //check to see if there is an existing token sent to the user.
-                var existingToken = _tokenData.GetTokenRecordByEmailAddress(existingUser.EmailAddress);
-                if (existingToken.Id == default)
-                {
-                    var token = new Token()
-                    {
-                        Body = NewToken(),
-                        EmailAddress = existingUser.EmailAddress
-                    };
-                    var result = _tokenData.CreateNewToken(token);
-                    if (result)
-                    {
-                        result = _mailHelper.NotifyUserForPasswordReset(existingUser.EmailAddress, token.Body).Success;
-                    }
-                }
+                GenerateTokenForEmailAddress(existingUser.EmailAddress, true);
             }
             //for security purposes we want to always return true for this method.
             //otherwise someone can spam the reset password method to sniff out users.
@@ -175,7 +249,8 @@ namespace CarCareTracker.Logic
                     Id = -1,
                     UserName = credentials.UserName,
                     IsAdmin = true,
-                    IsRootUser = true
+                    IsRootUser = true,
+                    EmailAddress = string.Empty
                 };
             }
             else
@@ -193,6 +268,19 @@ namespace CarCareTracker.Logic
                 }
             }
         }
+        public UserData ValidateOpenIDUser(LoginModel credentials)
+        {
+            var result = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (result.Id != default)
+            {
+                result.Password = string.Empty;
+                return result;
+            }
+            else
+            {
+                return new UserData();
+            }
+        }
         #region "Admin Functions"
         public bool MakeUserAdmin(int userId, bool isAdmin)
         {
@@ -280,19 +368,32 @@ namespace CarCareTracker.Logic
         #region "Root User"
         public bool CreateRootUserCredentials(LoginModel credentials)
         {
-            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
-            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-            if (existingUserConfig is not null)
+            //check if file exists
+            if (File.Exists(StaticHelper.UserConfigPath))
             {
-                //create hashes of the login credentials.
-                var hashedUserName = GetHash(credentials.UserName);
-                var hashedPassword = GetHash(credentials.Password);
-                //copy over settings that are off limits on the settings page.
-                existingUserConfig.EnableAuth = true;
-                existingUserConfig.UserNameHash = hashedUserName;
-                existingUserConfig.UserPasswordHash = hashedPassword;
+                var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+                var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+                if (existingUserConfig is not null)
+                {
+                    //create hashes of the login credentials.
+                    var hashedUserName = GetHash(credentials.UserName);
+                    var hashedPassword = GetHash(credentials.Password);
+                    //copy over settings that are off limits on the settings page.
+                    existingUserConfig.EnableAuth = true;
+                    existingUserConfig.UserNameHash = hashedUserName;
+                    existingUserConfig.UserPasswordHash = hashedPassword;
+                }
+                File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
+            } else
+            {
+                var newUserConfig = new UserConfig()
+                {
+                    EnableAuth = true,
+                    UserNameHash = GetHash(credentials.UserName),
+                    UserPasswordHash = GetHash(credentials.Password)
+                };
+                File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(newUserConfig));
             }
-            File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
             _cache.Remove("userConfig_-1");
             return true;
         }
@@ -314,21 +415,9 @@ namespace CarCareTracker.Logic
         }
         private bool UserIsRoot(LoginModel credentials)
         {
-            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
-            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-            if (existingUserConfig is not null)
-            {
-                //create hashes of the login credentials.
-                var hashedUserName = GetHash(credentials.UserName);
-                var hashedPassword = GetHash(credentials.Password);
-                //compare against stored hash.
-                if (hashedUserName == existingUserConfig.UserNameHash &&
-                    hashedPassword == existingUserConfig.UserPasswordHash)
-                {
-                    return true;
-                }
-            }
-            return false;
+            var hashedUserName = GetHash(credentials.UserName);
+            var hashedPassword = GetHash(credentials.Password);
+            return _configHelper.AuthenticateRootUser(hashedUserName, hashedPassword);
         }
         #endregion
         private static string GetHash(string value)
@@ -350,5 +439,30 @@ namespace CarCareTracker.Logic
         {
             return Guid.NewGuid().ToString().Substring(0, 8);
         }
+        public bool GenerateTokenForEmailAddress(string emailAddress, bool isPasswordReset)
+        {
+            bool result = false;
+            //check if there is already a token tied to this email address.
+            var existingToken = _tokenData.GetTokenRecordByEmailAddress(emailAddress);
+            if (existingToken.Id == default)
+            {
+                //no token, generate one and send.
+                var token = new Token()
+                {
+                    Body = NewToken(),
+                    EmailAddress = emailAddress
+                };
+                result = _tokenData.CreateNewToken(token);
+                if (result)
+                {
+                    result = isPasswordReset ? _mailHelper.NotifyUserForPasswordReset(emailAddress, token.Body).Success : _mailHelper.NotifyUserForAccountUpdate(emailAddress, token.Body).Success;
+                }
+            } else
+            {
+                //token exists, send it again.
+                result = isPasswordReset ? _mailHelper.NotifyUserForPasswordReset(emailAddress, existingToken.Body).Success : _mailHelper.NotifyUserForAccountUpdate(emailAddress, existingToken.Body).Success;
+            }
+            return result;
+        }
     }
 }

Logic/OdometerLogic.cs

@@ -0,0 +1,67 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+
+namespace CarCareTracker.Logic
+{
+    public interface IOdometerLogic
+    {
+        int GetLastOdometerRecordMileage(int vehicleId, List<OdometerRecord> odometerRecords);
+        bool AutoInsertOdometerRecord(OdometerRecord odometer);
+        List<OdometerRecord> AutoConvertOdometerRecord(List<OdometerRecord> odometerRecords);
+    }
+    public class OdometerLogic: IOdometerLogic
+    {
+        private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
+        private readonly ILogger<IOdometerLogic> _logger;
+        public OdometerLogic(IOdometerRecordDataAccess odometerRecordDataAccess, ILogger<IOdometerLogic> logger)
+        {
+            _odometerRecordDataAccess = odometerRecordDataAccess;
+            _logger = logger;
+        }
+        public int GetLastOdometerRecordMileage(int vehicleId, List<OdometerRecord> odometerRecords)
+        {
+            if (!odometerRecords.Any())
+            {
+                odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            }
+            if (!odometerRecords.Any())
+            {
+                //no existing odometer records for this vehicle.
+                return 0;
+            }
+            return odometerRecords.Max(x => x.Mileage);
+        }
+        public bool AutoInsertOdometerRecord(OdometerRecord odometer)
+        {
+            var lastReportedMileage = GetLastOdometerRecordMileage(odometer.VehicleId, new List<OdometerRecord>());
+            odometer.InitialMileage = lastReportedMileage != default ? lastReportedMileage : odometer.Mileage;
+
+            var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometer);
+            return result;
+        }
+        public List<OdometerRecord> AutoConvertOdometerRecord(List<OdometerRecord> odometerRecords)
+        {
+            //perform ordering
+            odometerRecords = odometerRecords.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
+            int previousMileage = 0;
+            for (int i = 0; i < odometerRecords.Count; i++)
+            {
+                var currentObject = odometerRecords[i];
+                if (previousMileage == default)
+                {
+                    //first record
+                    currentObject.InitialMileage = currentObject.Mileage;
+                }
+                else
+                {
+                    //subsequent records
+                    currentObject.InitialMileage = previousMileage;
+                }
+                //save to db.
+                _odometerRecordDataAccess.SaveOdometerRecordToVehicle(currentObject);
+                previousMileage = currentObject.Mileage;
+            }
+            return odometerRecords;
+        }
+    }
+}

Logic/UserLogic.cs

@@ -1,7 +1,6 @@
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
-using Microsoft.AspNetCore.Mvc.Formatters;
 
 namespace CarCareTracker.Logic
 {

MapProfile/ImportMappers.cs

@@ -10,6 +10,7 @@ namespace CarCareTracker.MapProfile
             Map(m => m.Date).Name(["date", "fuelup_date"]);
             Map(m => m.DateCreated).Name(["datecreated"]);
             Map(m => m.DateModified).Name(["datemodified"]);
+            Map(m => m.InitialOdometer).Name(["initialodometer"]);
             Map(m => m.Odometer).Name(["odometer"]);
             Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed"]);
             Map(m => m.Cost).Name(["cost", "total cost", "totalcost", "total price"]);

Middleware/Authen.cs

@@ -1,9 +1,7 @@
 using CarCareTracker.Logic;
 using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.DataProtection;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using System.Security.Claims;
 using System.Text.Encodings.Web;
@@ -123,6 +121,7 @@ namespace CarCareTracker.Middleware
                                 {
                                     new(ClaimTypes.Name, authCookie.UserData.UserName),
                                     new(ClaimTypes.NameIdentifier, authCookie.UserData.Id.ToString()),
+                                    new(ClaimTypes.Email, authCookie.UserData.EmailAddress),
                                     new(ClaimTypes.Role, "CookieAuth")
                                 };
                                 if (authCookie.UserData.IsAdmin)

Models/Collision/CollisionRecordInput.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int ReminderRecordId { get; set; }
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
@@ -13,6 +14,20 @@
         public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public CollisionRecord ToCollisionRecord() { return new CollisionRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; }
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public CollisionRecord ToCollisionRecord() { return new CollisionRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            Date = DateTime.Parse(Date),
+            Cost = Cost, 
+            Mileage = Mileage, 
+            Description = Description, 
+            Notes = Notes, 
+            Files = Files, 
+            Tags = Tags, 
+            ExtraFields = ExtraFields,
+            RequisitionHistory = RequisitionHistory
+        }; 
+        }
     }
 }

Models/GasRecord/GasRecordEditModel.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class GasRecordEditModel
+    {
+        public List<int> RecordIds { get; set; } = new List<int>();
+        public GasRecord EditRecord { get; set; } = new GasRecord();
+    }
+}

Models/GasRecord/GasRecordViewModel.cs

@@ -22,6 +22,7 @@
         public bool MissedFuelUp { get; set; }
         public string Notes { get; set; }
         public List<string> Tags { get; set; } = new List<string>();
+        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public bool IncludeInAverage { get { return MilesPerGallon > 0 || (!IsFillToFull && !MissedFuelUp); } }
     }
 }

Models/GenericRecordEditModel.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public class GenericRecordEditModel
+    {
+        public ImportMode DataType { get; set; }
+        public List<int> RecordIds { get; set; } = new List<int>();
+        public GenericRecord EditRecord { get; set; } = new GenericRecord();
+    }
+}

Models/OIDC/OpenIDConfig.cs

@@ -0,0 +1,18 @@
+namespace CarCareTracker.Models
+{
+    public class OpenIDConfig
+    {
+        public string Name { get; set; }
+        public string ClientId { get; set; }
+        public string ClientSecret { get; set; }
+        public string AuthURL { get; set; }
+        public string TokenURL { get; set; }
+        public string RedirectURL { get; set; }
+        public string Scope { get; set; }
+        public string State { get; set; }
+        public bool ValidateState { get; set; } = false;
+        public bool DisableRegularLogin { get; set; } = false;
+        public string LogOutURL { get; set; } = "";
+        public string RemoteAuthURL { get { return $"{AuthURL}?client_id={ClientId}&response_type=code&redirect_uri={RedirectURL}&scope={Scope}&state={State}"; } }
+    }
+}

Models/OIDC/OpenIDResult.cs

@@ -0,0 +1,7 @@
+namespace CarCareTracker.Models
+{
+    public class OpenIDResult
+    {
+        public string id_token { get; set; }
+    }
+}

Models/OdometerRecord/OdometerRecord.cs

@@ -5,7 +5,9 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public DateTime Date { get; set; }
+        public int InitialMileage { get; set; }
         public int Mileage { get; set; }
+        public int DistanceTraveled { get { return Mileage - InitialMileage; } }
         public string Notes { get; set; }
         public List<string> Tags { get; set; } = new List<string>();
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();

Models/OdometerRecord/OdometerRecordEditModel.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class OdometerRecordEditModel
+    {
+        public List<int> RecordIds { get; set; } = new List<int>();
+        public OdometerRecord EditRecord { get; set; } = new OdometerRecord();
+    }
+}

Models/OdometerRecord/OdometerRecordInput.cs

@@ -5,11 +5,12 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
+        public int InitialMileage { get; set; }
         public int Mileage { get; set; }
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; }
+        public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields, InitialMileage = InitialMileage }; }
     }
 }

Models/PlanRecord/PlanCostItem.cs

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

Models/PlanRecord/PlanRecord.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int ReminderRecordId { get; set; }
         public DateTime DateCreated { get; set; }
         public DateTime DateModified { get; set; }
         public string Description { get; set; }
@@ -14,5 +15,6 @@
         public PlanProgress Progress { get; set; }
         public decimal Cost { get; set; }
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
     }
 }

Models/PlanRecord/PlanRecordInput.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int ReminderRecordId { get; set; }
         public string DateCreated { get; set; } = DateTime.Now.ToShortDateString();
         public string DateModified { get; set; } = DateTime.Now.ToShortDateString();
         public string Description { get; set; }
@@ -15,9 +16,11 @@
         public PlanProgress Progress { get; set; }
         public decimal Cost { get; set; }
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public PlanRecord ToPlanRecord() { return new PlanRecord { 
             Id = Id, 
             VehicleId = VehicleId, 
+            ReminderRecordId = ReminderRecordId,
             DateCreated = DateTime.Parse(DateCreated), 
             DateModified = DateTime.Parse(DateModified),
             Description = Description, 
@@ -27,7 +30,12 @@
             Cost = Cost,
             Priority = Priority,
             Progress = Progress,
-            ExtraFields = ExtraFields
+            ExtraFields = ExtraFields,
+            RequisitionHistory = RequisitionHistory
         }; }
+        /// <summary>
+        /// only used to hide view template button on plan create modal.
+        /// </summary>
+        public bool CreatedFromReminder { get; set; }
     }
 }

Models/Reminder/ReminderConfig.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public class ReminderUrgencyConfig
+    {
+        public int UrgentDays { get; set; } = 30;
+        public int VeryUrgentDays { get; set; } = 7;
+        public int UrgentDistance { get; set; } = 100;
+        public int VeryUrgentDistance { get; set; } = 50;
+    }
+}

Models/Report/CostForVehicleByMonth.cs

@@ -5,5 +5,6 @@
         public int MonthId { get; set; }
         public string MonthName { get; set; }
         public decimal Cost { get; set; }
+        public int DistanceTraveled { get; set; }
     }
 }

Models/Report/VehicleHistoryViewModel.cs

@@ -8,5 +8,10 @@
         public string MPG { get; set; }
         public decimal TotalCost { get; set; }
         public decimal TotalGasCost { get; set; }
+        public string DaysOwned { get; set; }
+        public string DistanceTraveled { get; set; }
+        public decimal TotalCostPerMile { get; set; }
+        public decimal TotalGasCostPerMile { get; set; }
+        public string DistanceUnit { get; set; }
     }
 }

Models/ServiceRecord/ServiceRecordInput.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int ReminderRecordId { get; set; }
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
@@ -13,6 +14,20 @@
         public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public ServiceRecord ToServiceRecord() { return new ServiceRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; }
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public ServiceRecord ToServiceRecord() { return new ServiceRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            Date = DateTime.Parse(Date), 
+            Cost = Cost, 
+            Mileage = Mileage, 
+            Description = Description, 
+            Notes = Notes, 
+            Files = Files, 
+            Tags = Tags, 
+            ExtraFields = ExtraFields,
+            RequisitionHistory = RequisitionHistory
+        }; 
+        }
     }
 }

Models/Shared/GenericRecord.cs

@@ -12,5 +12,6 @@
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set;} = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
     }
 }

Models/Shared/ImportModel.cs

@@ -11,6 +11,7 @@
         public string Type { get; set; }
         public string Priority { get; set; }
         public string Progress { get; set; }
+        public string InitialOdometer { get; set; }
         public string Odometer { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
@@ -50,6 +51,7 @@
     public class OdometerRecordExportModel
     {
         public string Date { get; set; }
+        public string InitialOdometer { get; set; }
         public string Odometer { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }

Models/Supply/SupplyRecord.cs

@@ -35,5 +35,6 @@
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
     }
 }

Models/Supply/SupplyRecordInput.cs

@@ -14,6 +14,7 @@
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public SupplyRecord ToSupplyRecord() { return new SupplyRecord { 
             Id = Id, 
             VehicleId = VehicleId, 
@@ -26,7 +27,8 @@
             Notes = Notes, 
             Files = Files,
             Tags = Tags,
-            ExtraFields = ExtraFields
+            ExtraFields = ExtraFields,
+            RequisitionHistory = RequisitionHistory
         }; }
     }
 }

Models/Supply/SupplyUsageHistory.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyUsageHistory {
+        public DateTime Date { get; set; }
+        public string PartNumber { get; set; }
+        public string Description { get; set; }
+        public decimal Quantity { get; set; }
+        public decimal Cost { get; set; }
+    }
+}

Models/TaxRecord/TaxRecordInput.cs

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

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int ReminderRecordId { get; set; }
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
@@ -13,6 +14,20 @@
         public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; }
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            Date = DateTime.Parse(Date), 
+            Cost = Cost, 
+            Mileage = Mileage, 
+            Description = Description, 
+            Notes = Notes, 
+            Files = Files, 
+            Tags = Tags, 
+            ExtraFields = ExtraFields,
+            RequisitionHistory = RequisitionHistory
+        }; 
+        }
     }
 }

Models/User/UserColumnPreference.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class UserColumnPreference
+    {
+        public ImportMode Tab { get; set; }
+        public List<string> VisibleColumns { get; set; } = new List<string>();
+    }
+}

Models/UserConfig.cs

@@ -14,8 +14,12 @@
         public bool EnableAutoReminderRefresh { get; set; }
         public bool EnableAutoOdometerInsert { get; set; }
         public bool EnableShopSupplies { get; set; }
+        public bool EnableExtraFieldColumns { get; set; }
+        public bool HideSoldVehicles { get; set; }
         public string PreferredGasUnit { get; set; } = string.Empty;
         public string PreferredGasMileageUnit { get; set; } = string.Empty;
+        public List<UserColumnPreference> UserColumnPreferences { get; set; } = new List<UserColumnPreference>();
+        public ReminderUrgencyConfig ReminderUrgencyConfig { get; set; } = new ReminderUrgencyConfig();
         public string UserNameHash { get; set; }
         public string UserPasswordHash { get; set;}
         public string UserLanguage { get; set; } = "en_US";

Models/Vehicle.cs

@@ -8,8 +8,20 @@
         public string Make { get; set; }
         public string Model { get; set; }
         public string LicensePlate { get; set; }
+        public string PurchaseDate { get; set; }
+        public string SoldDate { get; set; }
         public bool IsElectric { get; set; } = false;
         public bool UseHours { get; set; } = false;
+        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<string> Tags { get; set; } = new List<string>();
+        public bool HasOdometerAdjustment { get; set; } = false;
+        /// <summary>
+        /// Primarily used for vehicles with odometer units different from user's settings.
+        /// </summary>
+        public string OdometerMultiplier { get; set; } = "1";
+        /// <summary>
+        /// Primarily used for vehicles where the odometer does not reflect actual mileage.
+        /// </summary>
+        public string OdometerDifference { get; set; } = "0";
     }
 }

Program.cs

@@ -10,9 +10,15 @@ using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 var builder = WebApplication.CreateBuilder(args);
 
+//Print Messages
+StaticHelper.InitMessage(builder.Configuration);
+
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+//LiteDB is always injected even if user uses Postgres.
+builder.Services.AddSingleton<ILiteDBHelper, LiteDBHelper>();
+
 //data access method
 if (!string.IsNullOrWhiteSpace(builder.Configuration["POSTGRES_CONNECTION"])){
     builder.Services.AddSingleton<IVehicleDataAccess, PGVehicleDataAccess>();
@@ -66,6 +72,7 @@ builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
 //configure logic
 builder.Services.AddSingleton<ILoginLogic, LoginLogic>();
 builder.Services.AddSingleton<IUserLogic, UserLogic>();
+builder.Services.AddSingleton<IOdometerLogic, OdometerLogic>();
 
 if (!Directory.Exists("data"))
 {
@@ -103,7 +110,21 @@ var app = builder.Build();
 
 // Configure the HTTP request pipeline.
 app.UseExceptionHandler("/Home/Error");
-app.UseStaticFiles();
+
+app.UseStaticFiles(new StaticFileOptions
+{
+    OnPrepareResponse = ctx =>
+    {
+        if (ctx.Context.Request.Path.StartsWithSegments("/images") || ctx.Context.Request.Path.StartsWithSegments("/documents"))
+        {
+            ctx.Context.Response.Headers.Add("Cache-Control", "no-store");
+            if (!ctx.Context.User.Identity.IsAuthenticated)
+            {
+                ctx.Context.Response.Redirect("/Login");
+            }
+        }
+    }
+});
 
 app.UseRouting();
 

README.md

@@ -1,39 +1,28 @@
 ![image](https://github.com/hargata/lubelog/assets/155338622/545debcd-d80a-44da-b892-4c652ab0384a)
 
-A self-hosted, open-source vehicle service records and maintainence tracker.
+Self-Hosted, Open-Source, Web-Based Vehicle Maintenance and Fuel Mileage Tracker
 
-Visit our website: https://lubelogger.com
-
-Support this project by [Subscribing on Patreon](https://patreon.com/LubeLogger) or [Making a Donation](https://buy.stripe.com/aEU9Egc8DdMc9bO144)
+Website: https://lubelogger.com
 
 ## Why
-Because nobody should have to deal with a homemade spreadsheet or a shoebox full of receipts when it comes to vehicle maintainence.
+Because nobody should have to deal with a homemade spreadsheet or a shoebox full of receipts when it comes to vehicle maintenance.
 
-## Screenshots
-<a href="/docs/screenshots.md">Screenshots</a>
+## Showcase
+[Promotional Brochure](https://lubelogger.com/brochure.pdf)
+
+[Screenshots](/docs/screenshots.md)
 
 ## Demo
 Try it out before you download it! The live demo resets every 20 minutes.
 
 [Live Demo](https://demo.lubelogger.com) Login using username "test" and password "1234"
 
-## Dependencies
-- Bootstrap
-- LiteDB
-- Bootstrap-DatePicker
-- SweetAlert2
-- CsvHelper
-- Chart.js
-- Drawdown
+## Download
+LubeLogger is available as both a Docker Image and a Windows Standalone Executable.
 
-## Docker Setup (GHCR)
-1. Install Docker
-2. Run `docker pull ghcr.io/hargata/lubelogger:latest`
-3. CHECK culture in .env file, default is en_US, this will change the currency and date formats. You can also setup SMTP Config here.
-4. If using traefik, use docker-compose.traefik.yml
-5. Run `docker-compose up`
+Read this [Getting Started Guide](https://docs.lubelogger.com/Getting%20Started) on how to download either of them
 
-## Docker Setup (Manual Build)
+### Docker Setup (Manual Build for Advanced Users)
 1. Install Docker
 2. Clone this repo
 3. CHECK culture in .env file, default is en_US, also setup SMTP for user management if you want that.
@@ -42,38 +31,27 @@ Try it out before you download it! The live demo resets every 20 minutes.
 6. If using traefik, use docker-compose.traefik.yml
 7. Run `docker-compose up`
 
-## Additional Docker Instructions
+### Need Help?
+[Documentation](https://docs.lubelogger.com/)
 
-### manual
+[Troubleshooting Guide](https://docs.lubelogger.com/Troubleshooting)
 
-- build
+[Search Existing Issues](https://github.com/hargata/lubelog/issues)
 
-```
-docker build -t hargata/lubelog:latest .
-```
+## Dependencies
+- Bootstrap
+- LiteDB
+- Npgsql
+- Bootstrap-DatePicker
+- SweetAlert2
+- CsvHelper
+- Chart.js
+- Drawdown
 
-- run
+## License
+LubeLogger utilizes a dual-licensing model, see [License](/LICENSE) for more information
 
-```
-docker run -d hargata/lubelog:latest
-```
+## Support
+Support this project by [Subscribing on Patreon](https://patreon.com/LubeLogger) or [Making a Donation](https://buy.stripe.com/aEU9Egc8DdMc9bO144)
 
-add `-v` for persistent volumes as needed. Have a look at the docker-compose.yml for examples.
-
-## docker-compose
-
-- build image
-
-```
-docker compose build
-```
-
-- run
-
-```
-docker compose up
-
-# or variant with traefik labels:
-
-docker compose -f docker-compose.traefik.yml up
-```
+Note: Commercial users are required to maintain an active Patreon subscripton to be compliant with our licensing model.

Views/API/Index.cshtml

@@ -16,7 +16,7 @@
     <div class="col-1">
         <h6>Method</h6>
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <h6>Endpoint</h6>
     </div>
     <div class="col-3">
@@ -30,7 +30,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicles</code>
     </div>
     <div class="col-3">
@@ -44,7 +44,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/servicerecords</code>
     </div>
     <div class="col-3">
@@ -58,7 +58,7 @@
     <div class="col-1">
         POST
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/servicerecords/add</code>
     </div>
     <div class="col-3">
@@ -80,7 +80,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/repairrecords</code>
     </div>
     <div class="col-3">
@@ -94,7 +94,7 @@
     <div class="col-1">
         POST
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/repairrecords/add</code>
     </div>
     <div class="col-3">
@@ -116,7 +116,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/upgraderecords</code>
     </div>
     <div class="col-3">
@@ -130,7 +130,7 @@
     <div class="col-1">
         POST
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/upgraderecords/add</code>
     </div>
     <div class="col-3">
@@ -152,7 +152,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/taxrecords</code>
     </div>
     <div class="col-3">
@@ -166,7 +166,7 @@
     <div class="col-1">
         POST
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/taxrecords/add</code>
     </div>
     <div class="col-3">
@@ -187,7 +187,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/gasrecords</code>
     </div>
     <div class="col-3">
@@ -205,7 +205,7 @@
     <div class="col-1">
         POST
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/gasrecords/add</code>
     </div>
     <div class="col-3">
@@ -229,7 +229,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/reminders</code>
     </div>
     <div class="col-3">
@@ -245,7 +245,7 @@
         <div class="col-1">
             GET
         </div>
-        <div class="col-5">
+        <div class="col-5 copyable">
             <code>/api/vehicle/reminders/send</code>
         </div>
         <div class="col-3">
@@ -260,7 +260,7 @@
         <div class="col-1">
             GET
         </div>
-        <div class="col-5">
+        <div class="col-5 copyable">
             <code>/api/makebackup</code>
         </div>
         <div class="col-3">
@@ -275,7 +275,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords</code>
     </div>
     <div class="col-3">
@@ -285,11 +285,25 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/odometerrecords/latest</code>
+    </div>
+    <div class="col-3">
+        Returns last reported odometer for the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         POST
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords/add</code>
     </div>
     <div class="col-3">
@@ -300,8 +314,14 @@
         <br />
         Body(form-data): {<br />
             date - Date to be entered<br />
+        initialOdometer - Initial Odometer reading(optional)<br />
         odometer - Odometer reading<br />
         notes - notes(optional)<br />
         }
     </div>
-</div>
+</div>
+<script>
+    $('.copyable').on('click', function (e) {
+        copyToClipboard(e.currentTarget);
+    })
+</script>

Views/Admin/Index.cshtml

@@ -15,11 +15,11 @@
 }
 @model AdminViewModel
 <div class="container">
-    <div class="row">
-        <div class="col-1">
+    <div class="row d-flex align-items-center justify-content-between justify-content-md-start">
+        <div class="col-2 col-md-1">
             <a href="/Home" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></a>
         </div>
-        <div class="col-11">
+        <div class="col-6 col-md-7 text-end text-md-start">
             <span class="display-6">@translator.Translate(userLanguage, "Admin Panel")</span>
         </div>
     </div>
@@ -120,11 +120,6 @@
             }
         })
     }
-    function copyToClipboard(e) {
-        var textToCopy = e.textContent;
-        navigator.clipboard.writeText(textToCopy);
-        successToast("Copied to Clipboard");
-    }
     function generateNewToken() {
         Swal.fire({
             title: 'Generate Token',

Views/Home/Index.cshtml

@@ -12,8 +12,8 @@
     ViewData["Title"] = "LubeLogger";
 }
 @section Scripts {
-    <script src="~/js/garage.js"></script>
-    <script src="~/js/supplyrecord.js"></script>
+    <script src="~/js/garage.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/supplyrecord.js?v=@StaticHelper.VersionNumber"></script>
     <script src="~/lib/drawdown/drawdown.js"></script>
 }
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
@@ -24,11 +24,11 @@
         @if(config.GetServerEnableShopSupplies())
         {
             <li class="nav-item" role="presentation">
-                <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
+                <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</span></button>
             </li>
         }
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</button>
+            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</span></button>
         </li>
         <li class="nav-item" role="presentation">
             <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>@translator.Translate(userLanguage,"Settings")</span></button>
@@ -41,6 +41,12 @@
                     <a class="dropdown-item" href="/Admin"><span class="display-3 ms-2"><i class="bi bi-people me-2"></i>@translator.Translate(userLanguage,"Admin Panel")</span></a>
                 </li>
             }
+            @if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                <li>
+                    <button class="nav-link" onclick="showAccountInformationModal()"><span class="display-3 ms-2"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</span></button>
+                </li>
+            }
             <li class="nav-item" role="presentation">
                 <button class="nav-link" onclick="performLogOut()"><span class="display-3 ms-2"><i class="bi bi-box-arrow-right me-2"></i>@translator.Translate(userLanguage,"Logout")</span></button>
             </li>
@@ -84,6 +90,12 @@
                             <a class="dropdown-item" href="/Admin"><i class="bi bi-people me-2"></i>@translator.Translate(userLanguage,"Admin Panel")</a>
                         </li>
                     }
+                    @if (!User.IsInRole(nameof(UserData.IsRootUser)))
+                    {
+                        <li>
+                            <button class="dropdown-item" onclick="showAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>
+                        </li>
+                    }
                     <li>
                         <button class="dropdown-item" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>@translator.Translate(userLanguage,"Logout")</button>
                     </li>
@@ -107,7 +119,7 @@
 </div>
 
 <div class="modal fade" id="addVehicleModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="addVehicleModalContent">
         </div>
     </div>
@@ -118,6 +130,12 @@
         </div>
     </div>
 </div>
+<div class="modal fade" id="accountInformationModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content" id="accountInformationModalContent">
+        </div>
+    </div>
+</div>
 <script>
     loadGarage();
     bindWindowResize();

Views/Home/_AccountModal.cshtml

@@ -0,0 +1,35 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model UserData
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title" id="addVehicleModalLabel">@translator.Translate(userLanguage, "Update Profile")</h5>
+    <button type="button" class="btn-close" onclick="hideAccountInformationModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form class="form-inline">
+        <div class="form-group">
+            <label for="inputUsername">@translator.Translate(userLanguage, "Username")</label>
+            <input type="text" id="inputUsername" class="form-control" placeholder="@translator.Translate(userLanguage, "Account Username")" value="@Model.UserName">
+            <label for="inputEmail">@translator.Translate(userLanguage, "Email Address")</label>
+            <input type="text" id="inputEmail" class="form-control" placeholder="@translator.Translate(userLanguage, "Email Address")" value="@Model.EmailAddress">
+            <label for="inputPassword">@translator.Translate(userLanguage, "New Password")</label>
+            <input type="password" id="inputPassword" class="form-control" placeholder="@translator.Translate(userLanguage, "New Password")" value="">
+            <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
+            <input type="text" id="inputToken" class="form-control" placeholder="@translator.Translate(userLanguage, "Token")" value="">
+            <div class="row">
+                <div class="col-12">
+                    <a onclick="generateTokenForUser()" class="btn btn-link">@translator.Translate(userLanguage, "Send Token")</a>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideAccountInformationModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" onclick="validateAndSaveUserAccount()" class="btn btn-primary">@translator.Translate(userLanguage, "Update")</button>
+</div>

Views/Home/_Calendar.cshtml

@@ -1,10 +1,11 @@
-@model List<ReminderRecordViewModel>
+@using CarCareTracker.Helper
+@model List<ReminderRecordViewModel>
 <script>
     var eventDates = [];
     var groupedDates = [];
     @foreach(ReminderRecordViewModel reminderRecord in Model)
     {
-    @:eventDates.push({date: new Date(Date.parse(decodeHTMLEntities('@reminderRecord.Date.ToShortDateString()'))), description: decodeHTMLEntities('@reminderRecord.Description'), urgency: decodeHTMLEntities('@reminderRecord.Urgency.ToString()')});
+        @:eventDates.push({ id: @reminderRecord.Id, date: decodeHTMLEntities('@StaticHelper.GetEpochFromDateTime(reminderRecord.Date)'), description: decodeHTMLEntities('@reminderRecord.Description'), urgency: decodeHTMLEntities('@reminderRecord.Urgency.ToString()') });
     }
 </script>
 <div class="row vehicleDetailTabContainer">
@@ -13,6 +14,12 @@
         </div>
     </div>
 </div>
+<div class="modal fade" data-bs-focus="false" id="reminderRecordCalendarModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="reminderRecordCalendarModalContent">
+        </div>
+    </div>
+</div>
 <script>
     initCalendar();
 </script>

Views/Home/_ExtraFields.cshtml

@@ -27,6 +27,7 @@
                         <!option @(Model.Id == (int)ImportMode.SupplyRecord ? "selected" : "") value="@((int)ImportMode.SupplyRecord)">@translator.Translate(userLanguage, "Supplies")</!option>
                         <!option @(Model.Id == (int)ImportMode.PlanRecord ? "selected" : "") value="@((int)ImportMode.PlanRecord)">@translator.Translate(userLanguage, "Planner")</!option>
                         <!option @(Model.Id == (int)ImportMode.OdometerRecord ? "selected" : "") value="@((int)ImportMode.OdometerRecord)">@translator.Translate(userLanguage, "Odometer")</!option>
+                        <!option @(Model.Id == (int)ImportMode.VehicleRecord ? "selected" : "") value="@((int)ImportMode.VehicleRecord)">@translator.Translate(userLanguage, "Vehicle")</!option>
                     </select>
                 </div>
             </div>

Views/Home/_GarageDisplay.cshtml

@@ -1,5 +1,10 @@
-@model List<Vehicle>
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model List<Vehicle>
 @{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
 }
 @if (recordTags.Any())
@@ -23,17 +28,24 @@
     <div class="row gy-3 align-items-stretch vehiclesContainer">
         @foreach (Vehicle vehicle in Model)
         {
-            <div class="col-xl-2 col-lg-4 col-md-4 col-sm-4 col-4 user-select-none garage-item" data-tags='@string.Join(" ", vehicle.Tags)' id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom" data-bs-trigger="manual" onmouseenter="loadPinnedNotes(@vehicle.Id)" ontouchstart="loadPinnedNotes(@vehicle.Id)" ontouchcancel="hidePinnedNotes(@vehicle.Id)" ontouchend="hidePinnedNotes(@vehicle.Id)" onmouseleave="hidePinnedNotes(@vehicle.Id)">
-                <div class="card" onclick="viewVehicle(@vehicle.Id)">
-                    <img src="@vehicle.ImageLocation" style="height:145px; object-fit:scale-down;" />
-                    <div class="card-body">
-                        <h5 class="card-title text-truncate garage-item-year" data-unit="@vehicle.Year">@($"{vehicle.Year}")</h5>
-                        <h5 class="card-title text-truncate">@($"{vehicle.Make}")</h5>
-                        <h5 class="card-title text-truncate">@($"{vehicle.Model}")</h5>
-                        <p class="card-text text-truncate">@vehicle.LicensePlate</p>
+            @if (!(userConfig.HideSoldVehicles && !string.IsNullOrWhiteSpace(vehicle.SoldDate)))
+            {
+                <div class="col-xl-2 col-lg-4 col-md-4 col-sm-4 col-4 user-select-none garage-item" ondragover="dragOver(event)" ondrop="dropBox(event, @vehicle.Id)" draggable="true" ondragstart="dragStart(event, @vehicle.Id)" data-tags='@string.Join(" ", vehicle.Tags)' id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="@await Html.PartialAsync("_VehicleExtraFields", vehicle.ExtraFields)" data-bs-placement="bottom" data-bs-trigger="manual" onmouseenter="loadPinnedNotes(@vehicle.Id)" ontouchstart="loadPinnedNotes(@vehicle.Id)" ontouchcancel="hidePinnedNotes(@vehicle.Id)" ontouchend="hidePinnedNotes(@vehicle.Id)" onmouseleave="hidePinnedNotes(@vehicle.Id)">
+                    <div class="card" onclick="viewVehicle(@vehicle.Id)">
+                        <img src="@vehicle.ImageLocation" style="height:145px; object-fit:scale-down; pointer-events:none; @(string.IsNullOrWhiteSpace(vehicle.SoldDate) ? "" : "filter: grayscale(100%);")" />
+                        @if (!string.IsNullOrWhiteSpace(vehicle.SoldDate))
+                        {
+                            <div class="vehicle-sold-banner"><p class='display-6 mb-0'>@translator.Translate(userLanguage, "SOLD")</p></div>
+                        }
+                        <div class="card-body">
+                            <h5 class="card-title text-truncate garage-item-year" data-unit="@vehicle.Year">@($"{vehicle.Year}")</h5>
+                            <h5 class="card-title text-truncate">@($"{vehicle.Make}")</h5>
+                            <h5 class="card-title text-truncate">@($"{vehicle.Model}")</h5>
+                            <p class="card-text text-truncate">@vehicle.LicensePlate</p>
+                        </div>
                     </div>
                 </div>
-            </div>
+            }
         }
         <div class="col-xl-2 col-lg-4 col-md-4 col-sm-4 col-4 garage-item-add">
             <div class="card" onclick="showAddVehicleModal()" style="height:100%;">
@@ -41,4 +53,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

Views/Home/_ReminderRecordCalendarModal.cshtml

@@ -0,0 +1,39 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model ReminderRecordViewModel
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(translator.Translate(userLanguage, "View Reminder"))</h5>
+    <button type="button" class="btn-close" onclick="hideCalendarReminderModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12" id="reminderOptions">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="reminderDescription">@translator.Translate(userLanguage, "Date")</label>
+                    <input type="text" id="reminderDescription" readonly class="form-control" value="@Model.Date.ToShortDateString()">
+                    <label for="reminderDescription">@translator.Translate(userLanguage,"Description")</label>
+                    <input type="text" id="reminderDescription" readonly class="form-control" value="@Model.Description">
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="reminderNotes">@translator.Translate(userLanguage,"Notes")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <textarea id="reminderNotes" readonly class="form-control" rows="5">@Model.Notes</textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-danger" onclick="deleteCalendarReminderRecord(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage, "Delete")</button>
+    <button type="button" class="btn btn-secondary" onclick="hideCalendarReminderModal()">@translator.Translate(userLanguage, "Close")</button>
+    @if (Model.IsRecurring && (Model.Urgency == ReminderUrgency.VeryUrgent || Model.Urgency == ReminderUrgency.PastDue))
+    {
+        <button type="button" class="btn btn-primary" onclick="markDoneCalendarReminderRecord(@Model.Id)">@translator.Translate(userLanguage, "Mark as Done")</button>
+    }
+</div>

Views/Home/_Settings.cshtml

@@ -53,6 +53,14 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableAutoOdometerInsert" checked="@Model.UserConfig.EnableAutoOdometerInsert">
             <label class="form-check-label" for="enableAutoOdometerInsert">@translator.Translate(userLanguage, "Auto Insert Odometer Records")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Only when Adding Service/Repair/Upgrade/Fuel Record or Completing a Plan")</small></label>
         </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableExtraFieldColumns" checked="@Model.UserConfig.EnableExtraFieldColumns">
+            <label class="form-check-label" for="enableExtraFieldColumns">@translator.Translate(userLanguage, "Show Extra Field Columns")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Enabling this may cause performance issues")</small></label>
+        </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
+            <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
+        </div>
         <div class="form-check form-switch @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
             <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
@@ -180,10 +188,13 @@
             </div>
             <div class="row">
                 <div class="col-12 col-md-6">
-                    <span class="lead">@translator.Translate(userLanguage, "Manage Extra Fields")</span>
+                    <span class="lead">@translator.Translate(userLanguage, "Server-wide Settings")</span>
                     <div class="row">
-                        <div class="col-12 d-grid">
-                            <button onclick="showExtraFieldModal()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Add/Remove Extra Fields")</button>
+                        <div class="col-6 d-grid">
+                            <button onclick="showExtraFieldModal()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Extra Fields")</button>
+                        </div>
+                        <div class="col-6 d-grid">
+                            <button onclick="showReminderUrgencyThresholdModal()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Reminders")</button>
                         </div>
                     </div>
                 </div>
@@ -201,7 +212,7 @@
             <img src="/defaults/lubelogger_logo.png" />
         </div>
         <div class="d-flex justify-content-center">
-            <small class="text-body-secondary">Version 1.1.6</small>
+            <small class="text-body-secondary">@($"{translator.Translate(userLanguage, "Version")} {StaticHelper.VersionNumber}")</small>
         </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.
@@ -246,6 +257,53 @@
     </div>
 </div>
 <script>
+    function showReminderUrgencyThresholdModal(){
+        Swal.fire({
+            title: decodeHTMLEntities('@translator.Translate(userLanguage, "Configure Reminder Urgency Thresholds")'),
+            html: `
+                        <form>
+                                <div class='d-flex flex-row align-items-center'>
+                        <label class='form-label me-auto'>${decodeHTMLEntities('@translator.Translate(userLanguage, "Urgent(Days)")')}</label>
+                        <input type="text" id="inputUrgentDays" class="form-control" style='width:40%' placeholder="${decodeHTMLEntities('@translator.Translate(userLanguage, "Urgent")')}" value='@Model.UserConfig.ReminderUrgencyConfig.UrgentDays'>
+                        </div>
+                            <div class='d-flex flex-row align-items-center mt-2'>
+                                <label class='form-label me-auto'>${decodeHTMLEntities('@translator.Translate(userLanguage, "Very Urgent(Days)")')}</label>
+                                <input type="text" id="inputVeryUrgentDays" class="form-control" style='width:40%' placeholder="${decodeHTMLEntities('@translator.Translate(userLanguage, "Very Urgent")')}" value='@Model.UserConfig.ReminderUrgencyConfig.VeryUrgentDays'>
+                            </div>
+                            <div class='d-flex flex-row align-items-center mt-2'>
+                                    <label class='form-label me-auto'>${decodeHTMLEntities('@translator.Translate(userLanguage, "Urgent(Distance)")')}</label>
+                                <input type="text" id="inputUrgentDistance" class="form-control" style='width:40%' placeholder="${decodeHTMLEntities('@translator.Translate(userLanguage, "Urgent")')}" value='@Model.UserConfig.ReminderUrgencyConfig.UrgentDistance'>
+                           </div>
+                               <div class='d-flex flex-row align-items-center mt-2'>
+                                <label class='form-label me-auto'>${decodeHTMLEntities('@translator.Translate(userLanguage, "Very Urgent(Distance)")')}</label>
+                            <input type="text" id="inputVeryUrgentDistance" class="form-control" style='width:40%' placeholder="${decodeHTMLEntities('@translator.Translate(userLanguage, "Very Urgent")')}" value='@Model.UserConfig.ReminderUrgencyConfig.VeryUrgentDistance'>
+                        </div>
+                        </form>
+                    `,
+            confirmButtonText: decodeHTMLEntities('@translator.Translate(userLanguage, "Save")'),
+            focusConfirm: false,
+            preConfirm: () => {
+                const urgentDays = $("#inputUrgentDays").val();
+                const veryUrgentDays = $("#inputVeryUrgentDays").val();
+                const urgentDistance = $("#inputUrgentDistance").val();
+                const veryUrgentDistance = $("#inputVeryUrgentDistance").val();
+                if (!urgentDays || isNaN(urgentDays) || !veryUrgentDays || isNaN(veryUrgentDays) || !urgentDistance || isNaN(urgentDistance) || !veryUrgentDistance || isNaN(veryUrgentDistance)) {
+                    Swal.showValidationMessage(`Invalid parameters`)
+                }
+                return { urgentDays, veryUrgentDays, urgentDistance, veryUrgentDistance }
+            },
+        }).then(function (result) {
+            if (result.isConfirmed) {
+                $.post('/Home/SaveReminderUrgencyThreshold', { urgentDays: result.value.urgentDays, veryUrgentDays: result.value.veryUrgentDays, urgentDistance: result.value.urgentDistance, veryUrgentDistance: result.value.veryUrgentDistance }, function (data) {
+                    if (data) {
+                        setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
+                    } else {
+                        errorToast(genericErrorMessage());
+                    }
+                })
+            }
+        });
+    }
     function showExtraFieldModal() {
         $.get(`/Home/GetExtraFieldsModal?importMode=0`, function (data) {
             $("#extraFieldModalContent").html(data);
@@ -287,6 +345,8 @@
             enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
             enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
             enableShopSupplies: $("#enableShopSupplies").is(":checked"),
+            enableExtraFieldColumns: $("#enableExtraFieldColumns").is(":checked"),
+            hideSoldVehicles: $("#hideSoldVehicles").is(":checked"),
             preferredGasUnit: $("#preferredGasUnit").val(),
             preferredGasMileageUnit: $("#preferredFuelMileageUnit").val(),
             userLanguage: $("#defaultLanguage").val(),
@@ -342,6 +402,7 @@
     function restoreBackup(event) {
         let formData = new FormData();
         formData.append("file", event.files[0]);
+        console.log('LubeLogger - DB Restoration Started');
         sloader.show();
         $.ajax({
             url: "/Files/HandleFileUpload",
@@ -355,16 +416,21 @@
                     $.post('/Files/RestoreBackup', { fileName: response }, function (data) {
                         sloader.hide();
                         if (data) {
+                            console.log('LubeLogger - DB Restoration Completed');
                             successToast("Backup Restored");
                             setTimeout(function () { window.location.href = '/Home/Index' }, 500);
                         } else {
                             errorToast(genericErrorMessage());
+                            console.log('LubeLogger - DB Restoration Failed - Failed to process backup file.');
                         }
                     });
+                } else {
+                    console.log('LubeLogger - DB Restoration Failed - Failed to upload backup file.');
                 }
             },
             error: function () {
                 sloader.hide();
+                console.log('LubeLogger - DB Restoration Failed - Request failed to reach backend, please check file size.');
                 errorToast("An error has occurred, please check the file size and try again later.");
             }
         });

Views/Home/_VehicleExtraFields.cshtml

@@ -0,0 +1,10 @@
+@model List<ExtraField>
+@if (Model.Any())
+{
+    <ul class='list-group list-group-flush'>
+        @foreach (ExtraField field in Model)
+        {
+            <li><b>@field.Name</b> : @field.Value</li>
+        }
+    </ul>
+}

Views/Login/ForgotPassword.cshtml

@@ -9,7 +9,7 @@
     ViewData["Title"] = "LubeLogger - Login";
 }
 @section Scripts {
-    <script src="~/js/login.js"></script>
+    <script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
 }
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div class="row">

Views/Login/Index.cshtml

@@ -5,12 +5,13 @@
 @{
     var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
+    var openIdConfigName = config.GetOpenIDConfig().Name;
 }
 @{
     ViewData["Title"] = "LubeLogger - Login";
 }
 @section Scripts {
-    <script src="~/js/login.js"></script>
+    <script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
 }
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div class="row">
@@ -31,6 +32,17 @@
             <div class="d-grid">
                 <button type="button" class="btn btn-warning mt-2" onclick="performLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Login")</button>
             </div>
+            @if (!string.IsNullOrWhiteSpace(openIdConfigName))
+            {
+                <div class="d-grid">
+                    <button type="button" class="btn btn-secondary mt-2" onclick="remoteLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>@($"{translator.Translate(userLanguage, "Login via")} {openIdConfigName}")</button>
+                </div>
+            }
+            <div class="d-flex justify-content-center">
+                <div class="form-group">
+                    <small class="text-body-secondary">@config.GetMOTD()</small>
+                </div>
+            </div>
             <div class="d-grid">
                 <a href="/Login/ForgotPassword" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Forgot Password")</a>
             </div>
@@ -41,7 +53,7 @@
     </div>
 </div>
 <script>
-    function getRedirectURL(){
+    function getRedirectURL() {
         return { url: decodeHTMLEntities('@Model') };
     }
 </script>

Views/Login/OpenIDRegistration.cshtml

@@ -0,0 +1,50 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var logoUrl = config.GetLogoUrl();
+    var userLanguage = config.GetServerLanguage();
+}
+@model string
+@{
+    ViewData["Title"] = "LubeLogger - Register";
+}
+@section Scripts {
+    <script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
+}
+<div class="container d-flex align-items-center justify-content-center" style="height:100vh">
+    <div class="row">
+        <div class="col-12">
+            <img src="@logoUrl" />
+            <div class="form-group">
+                <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
+                <input type="text" id="inputToken" class="form-control">
+            </div>
+            <div class="form-group">
+                <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
+                <input type="text" id="inputUserName" class="form-control" value="@Model">
+            </div>
+            <div class="d-grid">
+                <button type="button" class="btn btn-warning mt-2" onclick="performOpenIdRegistration()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Register")</button>
+            </div>
+            <div class="d-grid">
+                <a href="/Login/Index" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Back to Login")</a>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    function performOpenIdRegistration() {
+        var token = $("#inputToken").val();
+        var userName = $("#inputUserName").val();
+        var userEmail = decodeHTMLEntities('@Model');
+        $.post('/Login/RegisterOpenIdUser', { userName: userName, token: token, emailAddress: userEmail }, function (data) {
+            if (data.success) {
+                successToast(data.message);
+                setTimeout(function () { window.location.href = '/Home' }, 500);
+            } else {
+                errorToast(data.message);
+            }
+        });
+    }
+</script>

Views/Login/Registration.cshtml

@@ -9,7 +9,7 @@
     ViewData["Title"] = "LubeLogger - Register";
 }
 @section Scripts {
-    <script src="~/js/login.js"></script>
+    <script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
 }
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div class="row">

Views/Login/ResetPassword.cshtml

@@ -9,7 +9,7 @@
     ViewData["Title"] = "LubeLogger - Register";
 }
 @section Scripts {
-    <script src="~/js/login.js"></script>
+    <script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
 }
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div class="row">

Views/Shared/_Layout.cshtml

@@ -10,6 +10,7 @@
     var useMarkDown = userConfig.UseMarkDownOnSavedNotes;
     var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
     var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+    var firstDayOfWeek = (int)System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
     var numberFormat = System.Globalization.CultureInfo.CurrentCulture.NumberFormat;
     var userLanguage = userConfig.UserLanguage;
     shortDatePattern = shortDatePattern.ToLower();
@@ -44,12 +45,12 @@
     <link rel="apple-touch-startup-image" href="~/defaults/lubelogger_launch.png" />
     <link rel="manifest" href="~/manifest.json">
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
-    <script src="~/js/shared.js"></script>
+    <script src="~/js/shared.js?v=@StaticHelper.VersionNumber"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/lib/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
     <script src="~/lib/bootstrap-tagsinput/bootstrap-tagsinput.js"></script>
     <script src="~/sweetalert/sweetalert2.all.min.js"></script>
-    <script src="~/js/loader.js"></script>
+    <script src="~/js/loader.js?v=@StaticHelper.VersionNumber"></script>
     <script>
         function getGlobalConfig() {
             return {
@@ -58,7 +59,8 @@
                 useMarkDown: "@useMarkDown" == "True",
                 currencySymbol: decodeHTMLEntities("@numberFormat.CurrencySymbol"),
                 useThreeDecimals: "@useThreeDecimals" == "True",
-                useMPG: "@useMPG" == "True"
+                useMPG: "@useMPG" == "True",
+                firstDayOfWeek: @firstDayOfWeek
             }
         }
         function getShortDatePattern() {

Views/Vehicle/Index.cshtml

@@ -10,18 +10,18 @@
 }
 @model Vehicle
 @section Scripts {
-    <script src="~/js/vehicle.js"></script>
-    <script src="~/js/servicerecord.js"></script>
-    <script src="~/js/gasrecord.js"></script>
-    <script src="~/js/collisionrecord.js"></script>
-    <script src="~/js/taxrecord.js"></script>
-    <script src="~/js/reminderrecord.js"></script>
-    <script src="~/js/upgraderecord.js"></script>
-    <script src="~/js/note.js"></script>
-    <script src="~/js/reports.js"></script>
-    <script src="~/js/supplyrecord.js"></script>
-    <script src="~/js/planrecord.js"></script>
-    <script src="~/js/odometerrecord.js"></script>
+    <script src="~/js/vehicle.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/servicerecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/gasrecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/collisionrecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/taxrecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/reminderrecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/upgraderecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/note.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/reports.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/supplyrecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/planrecord.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/odometerrecord.js?v=@StaticHelper.VersionNumber"></script>
     <script src="~/lib/chart-js/chart.umd.js"></script>
     <script src="~/lib/drawdown/drawdown.js"></script>
 }
@@ -139,7 +139,7 @@
     </div>
 </div>
 <div class="modal fade" id="editVehicleModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="editVehicleModalContent">
         </div>
     </div>
@@ -156,6 +156,12 @@
         </div>
     </div>
 </div>
+<div class="modal fade" data-bs-focus="false" id="genericRecordEditModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="genericRecordEditModalContent">
+        </div>
+    </div>
+</div>
 <div class="modal fade" data-bs-focus="false" id="inputSuppliesModal" tabindex="-1" role="dialog" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="inputSuppliesModalContent"></div>
@@ -163,7 +169,12 @@
 </div>
 <script>
     function GetVehicleId() {
-        return { vehicleId: @Model.Id};
+        return { 
+            vehicleId: @Model.Id, 
+            hasOdometerAdjustment: @Model.HasOdometerAdjustment.ToString().ToLower(),
+            odometerDifference: decodeHTMLEntities('@Model.OdometerDifference'),
+            odometerMultiplier: decodeHTMLEntities('@Model.OdometerMultiplier')
+        };
     }
     function GetDefaultTab() {
         return { tab: "@userConfig.DefaultTab" };

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -26,6 +26,14 @@
                     <input type="number" inputmode="numeric" id="collisionRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when repaired")" value="@(isNew ? "" : Model.Mileage)">
                     <label for="collisionRecordDescription">@translator.Translate(userLanguage,"Description")</label>
                     <input type="text" id="collisionRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of item(s) repaired(i.e. Alternator)")" value="@Model.Description">
+                    @if (isNew)
+                    {
+                        <div class="row">
+                            <div class="col-12">
+                                <a onclick="showRecurringReminderSelector('collisionRecordDescription')" class="btn btn-link">@translator.Translate(userLanguage, "Select Reminder")</a>
+                            </div>
+                        </div>
+                    }
                     <label for="collisionRecordCost">@translator.Translate(userLanguage,"Cost")</label>
                     <input type="text" inputmode="decimal" id="collisionRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the repair")" value="@(isNew ? "" : Model.Cost)">
                     @if (isNew)
@@ -56,7 +64,7 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="collisionRecordFiles">@translator.Translate(userLanguage,"Upload more documents")</label>
-                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="collisionRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="collisionRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                         </div>
                     }
@@ -72,7 +80,7 @@
                             </div>
                         }
                         <label for="collisionRecordFiles">@translator.Translate(userLanguage,"Upload documents(optional)")</label>
-                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="collisionRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="collisionRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
                 </div>
@@ -83,6 +91,10 @@
 <div class="modal-footer">
     @if (!isNew)
     {
+        @if (Model.RequisitionHistory.Any())
+        {
+            <button type="button" class="btn btn-warning" onclick="toggleSupplyUsageHistory()"><i class="bi bi-shop"></i></button>
+        }
         <div class="btn-group" style="margin-right:auto;">
             <button type="button" class="btn btn-md mt-1 mb-1 btn-danger" onclick="deleteCollisionRecord(@Model.Id)">@translator.Translate(userLanguage,"Delete")</button>
             <button type="button" class="btn btn-md btn-danger btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
@@ -105,16 +117,18 @@
         <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Repair Record")</button>
     }
 </div>
+@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];
+    var recurringReminderRecordId = 0;
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)
     {
         @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
     }
-        }
+    }
     function getCollisionRecordModelData() {
         return { id: @Model.Id}
     }

Views/Vehicle/_CollisionRecords.cshtml

@@ -7,6 +7,12 @@
     var hideZero = userConfig.HideZero;
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
     var userLanguage = userConfig.UserLanguage;
+    var extraFields = new List<string>();
+    if (userConfig.EnableExtraFieldColumns)
+    {
+        extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
+    }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.RepairRecord);
 }
 @model List<CollisionRecord>
 <div class="row">
@@ -38,6 +44,49 @@
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('RepairRecord')">@translator.Translate(userLanguage,"Export to CSV")</a></li>
                         <li><hr class="dropdown-divider"></li>
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage,"Print")</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="searchTableRows('accident-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'RepairRecord')" type="checkbox" id="chkCol_Date" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Date">@translator.Translate(userLanguage, "Date")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='odometer' onChange="showTableColumns(this, 'RepairRecord')" type="checkbox" id="chkCol_Odometer" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Odometer">@translator.Translate(userLanguage, "Odometer")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'RepairRecord')" type="checkbox" id="chkCol_Description" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Description">@translator.Translate(userLanguage, "Description")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='cost' onChange="showTableColumns(this, 'RepairRecord')" type="checkbox" id="chkCol_Cost" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Cost">@translator.Translate(userLanguage, "Cost")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'RepairRecord')" type="checkbox" id="chkCol_Notes" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
+                            </div>
+                        </li>
+                        @foreach (string extraFieldColumn in extraFields)
+                        {
+                            var elementId = Guid.NewGuid();
+                            <li class="dropdown-item">
+                                <div class="list-group-item">
+                                    <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'RepairRecord')" type="checkbox" id="@elementId">
+                                    <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
+                                </div>
+                            </li>
+                        }
                     </ul>
                 </div>
             }
@@ -58,22 +107,42 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2 col-xl-1">@translator.Translate(userLanguage,"Date")</th>
-                    <th scope="col" class="col-2">@translator.Translate(userLanguage,"Odometer")</th>
-                    <th scope="col" class="col-3 col-xl-4">@translator.Translate(userLanguage,"Description")</th>
-                    <th scope="col" class="col-2" onclick="toggleSort('accident-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage,"Cost")</th>
-                    <th scope="col" class="col-3">@translator.Translate(userLanguage,"Notes")</th>
+                    <th scope="col" class="col-2 col-xl-1 flex-grow-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
+                    <th scope="col" class="col-3 col-xl-4 flex-grow-1 flex-shrink-1" data-column="description">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" onclick="toggleSort('accident-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
+                    <th scope="col" class="col-3 flex-grow-1 flex-shrink-1" data-column="notes">@translator.Translate(userLanguage, "Notes")</th>
+                    @foreach (string extraFieldColumn in extraFields)
+                    {
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                    }
                 </tr>
             </thead>
             <tbody>
                 @foreach (CollisionRecord collisionRecord in Model)
                 {
-                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditCollisionRecordModal(@collisionRecord.Id)" data-tags='@string.Join(" ", collisionRecord.Tags)'>
-                        <td class="col-2 col-xl-1">@collisionRecord.Date.ToShortDateString()</td>
-                        <td class="col-2">@collisionRecord.Mileage</td>
-                        <td class="col-3 col-xl-4">@collisionRecord.Description</td>
-                        <td class="col-2" data-record-type="cost">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
+                    <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@collisionRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditCollisionRecordModal,@collisionRecord.Id)" data-tags='@string.Join(" ", collisionRecord.Tags)'>
+                        <td class="col-2 col-xl-1 flex-grow-1" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(collisionRecord.Date)">@collisionRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@collisionRecord.Mileage</td>
+                        <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1" data-column="description">@collisionRecord.Description</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
+                        @foreach (string extraFieldColumn in extraFields)
+                        {
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = collisionRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
+                                    if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
+                                    {
+                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue)</a>
+                                    }
+                                    else
+                                    {
+                                        @extraFieldValue
+                                    }
+                                }
+                            </td>
+                        }
                     </tr>
                 }
             </tbody>
@@ -87,4 +156,25 @@
         <div class="modal-content" id="collisionRecordModalContent">
         </div>
     </div>
-</div>
+</div>
+
+<ul class="table-context-menu dropdown-menu" style="display:none;">
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><hr class="context-menu-multiple dropdown-divider"></li>
+    <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'ServiceRecord')">@translator.Translate(userLanguage, "Service Records")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'UpgradeRecord')">@translator.Translate(userLanguage, "Upgrades")</a></li>
+    <li><hr class="dropdown-divider"></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><hr class="context-menu-active-multiple dropdown-divider"></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)">@translator.Translate(userLanguage, "Statistics")</a></li>
+    <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+</ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_Gas.cshtml

@@ -29,7 +29,8 @@
     {
         consumptionUnit = "imp gal";
         fuelEconomyUnit = useHours ? "h/g" : "mpg";
-    } else if (useUKMPG)
+    }
+    else if (useUKMPG)
     {
         fuelEconomyUnit = useHours ? "l/100h" : "l/100mi.";
         consumptionUnit = "l";
@@ -40,26 +41,33 @@
         consumptionUnit = useMPG ? "US gal" : "l";
         fuelEconomyUnit = useHours ? (useMPG ? "h/g" : "l/100h") : (useMPG ? "mpg" : "l/100km");
     }
+    var extraFields = new List<string>();
+    if (userConfig.EnableExtraFieldColumns)
+    {
+        extraFields = Model.GasRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
+    }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.GasRecord);
 }
 <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" data-aggregate-type="count">@($"{translator.Translate(userLanguage,"# of Gas Records")}: {Model.GasRecords.Count()}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="count">@($"{translator.Translate(userLanguage, "# of Gas Records")}: {Model.GasRecords.Count()}")</span>
             @if (Model.GasRecords.Where(x => x.MilesPerGallon > 0).Any())
             {
-                <span class="ms-2 badge bg-primary" id="averageFuelMileageLabel">@($"{translator.Translate(userLanguage,"Average Fuel Economy")}: {gasHelper.GetAverageGasMileage(Model.GasRecords, useMPG)}")</span>
+                <span class="ms-2 badge bg-primary" id="averageFuelMileageLabel">@($"{translator.Translate(userLanguage, "Average Fuel Economy")}: {gasHelper.GetAverageGasMileage(Model.GasRecords, useMPG)}")</span>
                 if (useMPG)
                 {
-                    <span class="ms-2 badge bg-primary" id="minFuelMileageLabel">@($"{translator.Translate(userLanguage,"Min Fuel Economy")}: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
-                    <span class="ms-2 badge bg-primary" id="maxFuelMileageLabel">@($"{translator.Translate(userLanguage,"Max Fuel Economy")}: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
-                } else
+                    <span class="ms-2 badge bg-primary" id="minFuelMileageLabel">@($"{translator.Translate(userLanguage, "Min Fuel Economy")}: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
+                    <span class="ms-2 badge bg-primary" id="maxFuelMileageLabel">@($"{translator.Translate(userLanguage, "Max Fuel Economy")}: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
+                }
+                else
                 {
-                    <span class="ms-2 badge bg-primary" id="minFuelMileageLabel">@($"{translator.Translate(userLanguage,"Min Fuel Economy")}: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
-                    <span class="ms-2 badge bg-primary" id="maxFuelMileageLabel">@($"{translator.Translate(userLanguage,"Max Fuel Economy")}: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
+                    <span class="ms-2 badge bg-primary" id="minFuelMileageLabel">@($"{translator.Translate(userLanguage, "Min Fuel Economy")}: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
+                    <span class="ms-2 badge bg-primary" id="maxFuelMileageLabel">@($"{translator.Translate(userLanguage, "Max Fuel Economy")}: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
                 }
             }
-            <span class="ms-2 badge bg-success">@($"{translator.Translate(userLanguage,"Total Fuel Consumed")}: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
-            <span class="ms-2 badge bg-success" data-aggregate-type="sum">@($"{translator.Translate(userLanguage,"Total Cost")}: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
+            <span class="ms-2 badge bg-success">@($"{translator.Translate(userLanguage, "Total Fuel Consumed")}: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="sum">@($"{translator.Translate(userLanguage, "Total Cost")}: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
             @foreach (string recordTag in recordTags)
             {
                 <span onclick="toggleGasFilter(this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
@@ -74,19 +82,82 @@
         @if (enableCsvImports)
         {
             <div class="btn-group">
-                <button onclick="showAddGasRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage,"Add Gas Record")</button>
+                <button onclick="showAddGasRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Gas 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('GasRecord')">@translator.Translate(userLanguage,"Import via CSV")</a></li>
-                    <li><a class="dropdown-item" href="#" onclick="exportVehicleData('GasRecord')">@translator.Translate(userLanguage,"Export to CSV")</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('GasRecord')">@translator.Translate(userLanguage, "Import via CSV")</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="exportVehicleData('GasRecord')">@translator.Translate(userLanguage, "Export to CSV")</a></li>
                     <li><hr class="dropdown-divider"></li>
-                    <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage,"Print")</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="searchGasTableRows()">@translator.Translate(userLanguage, "Search")</a></li>
+                    <li><hr class="dropdown-divider"></li>
+                    <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='daterefueled' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_DateRefueled" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_DateRefueled">@translator.Translate(userLanguage, "Date Refueled")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='odometer' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_Odometer" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_Odometer">@translator.Translate(userLanguage, "Odometer")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='delta' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_Delta" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_Delta">@translator.Translate(userLanguage, "Delta")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='consumption' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_Consumption" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_Consumption">@translator.Translate(userLanguage, "Consumption")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='fueleconomy' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_FuelEconomy" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_FuelEconomy">@translator.Translate(userLanguage, "Fuel Economy")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='cost' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_Cost" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_Cost">@translator.Translate(userLanguage, "Cost")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='unitcost' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_UnitCost" checked>
+                            <label class="form-check-label stretched-link" for="chkCol_UnitCost">@translator.Translate(userLanguage, "Unit Cost")</label>
+                        </div>
+                    </li>
+                    <li class="dropdown-item">
+                        <div class="list-group-item">
+                            <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="chkCol_Notes">
+                            <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
+                        </div>
+                    </li>
+                    @foreach (string extraFieldColumn in extraFields)
+                    {
+                        var elementId = Guid.NewGuid();
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'GasRecord')" type="checkbox" id="@elementId">
+                                <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
+                            </div>
+                        </li>
+                    }
                 </ul>
             </div>
-        } else {
-            <button onclick="showAddGasRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage,"Add Gas Record")</button>
+        }
+        else
+        {
+            <button onclick="showAddGasRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Gas Record")</button>
         }
     </div>
 </div>
@@ -100,26 +171,48 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2">@translator.Translate(userLanguage,"Date Refueled")</th>
-                    <th scope="col" class="col-2">@($"{translator.Translate(userLanguage, "Odometer")}({distanceUnit})")</th>
-                    <th scope="col" class="col-1" style="cursor:pointer;" onclick="toggleSort('gas-tab-pane', this)">@($"Δ({distanceUnit})")</th>
-                    <th scope="col" class="col-2" data-gas="consumption" data-unit="@consumptionUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{translator.Translate(userLanguage,"Consumption")}({consumptionUnit})")</th>
-                    <th scope="col" class="col-3" data-gas="fueleconomy" data-unit="@fuelEconomyUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{@translator.Translate(userLanguage,"Fuel Economy")}({fuelEconomyUnit})")</th>
-                    <th scope="col" class="col-1" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage,"Cost")</th>
-                    <th scope="col" class="col-1" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage,"Unit Cost")</th>
+                    <th scope="col" class="col-2 flex-grow-1" data-column="daterefueled">@translator.Translate(userLanguage, "Date Refueled")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@($"{translator.Translate(userLanguage, "Odometer")}({distanceUnit})")</th>
+                    <th scope="col" class="col-1 flex-grow-1 flex-shrink-1" data-column="delta" style="cursor:pointer;" onclick="toggleSort('gas-tab-pane', this)">@($"Δ({distanceUnit})")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="consumption" data-gas="consumption" data-unit="@consumptionUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{translator.Translate(userLanguage, "Consumption")}({consumptionUnit})")</th>
+                    <th scope="col" class="col-3 flex-grow-1 flex-shrink-1" data-column="fueleconomy" data-gas="fueleconomy" data-unit="@fuelEconomyUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{@translator.Translate(userLanguage, "Fuel Economy")}({fuelEconomyUnit})")</th>
+                    <th scope="col" class="col-1 flex-grow-1 flex-shrink-1" data-column="cost" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
+                    <th scope="col" class="col-1 flex-grow-1 flex-shrink-1" data-column="unitcost" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Unit Cost")</th>
+                    <th scope="col" class="col-3 flex-grow-1 flex-shrink-1" style='display:none;' data-column="notes">@translator.Translate(userLanguage, "Notes")</th>
+                    @foreach (string extraFieldColumn in extraFields)
+                    {
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                    }
                 </tr>
             </thead>
             <tbody>
                 @foreach (GasRecordViewModel gasRecord in Model.GasRecords)
                 {
-                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditGasRecordModal(@gasRecord.Id)" data-tags='@string.Join(" ", gasRecord.Tags)'>
-                        <td class="col-2">@gasRecord.Date</td>
-                        <td class="col-2" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@gasRecord.Mileage</td>
-                        <td class="col-1">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
-                        <td class="col-2" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
-                        <td class="col-3" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
-                        <td class="col-1" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
-                        <td class="col-1" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
+                    <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@gasRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditGasRecordModal,@gasRecord.Id)" data-tags='@string.Join(" ", gasRecord.Tags)'>
+                        <td class="col-2 flex-grow-1" data-column="daterefueled">@gasRecord.Date</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@gasRecord.Mileage</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1" data-column="delta">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1" data-column="fueleconomy" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1" data-column="unitcost" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="notes">@StaticHelper.TruncateStrings(gasRecord.Notes)</td>
+                        @foreach (string extraFieldColumn in extraFields)
+                        {
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = gasRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
+                                    if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
+                                    {
+                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue)</a>
+                                    }
+                                    else
+                                    {
+                                        @extraFieldValue
+                                    }
+                                }
+                            </td>
+                        }
                     </tr>
                 }
             </tbody>
@@ -131,18 +224,31 @@
 <div class="modal fade" data-bs-focus="false" id="gasRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="gasRecordModalContent">
-
         </div>
     </div>
 </div>
 
+<ul class="table-context-menu dropdown-menu" style="display:none;">
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleGasRecords(selectedRow)">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><hr class="context-menu-multiple dropdown-divider"></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+</ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}
 <script>
     @if (!string.IsNullOrWhiteSpace(preferredFuelEconomyUnit))
     {
         @:convertFuelMileageUnits(decodeHTMLEntities('@fuelEconomyUnit'), decodeHTMLEntities('@preferredFuelEconomyUnit'), false);
     }
-        @if (!string.IsNullOrWhiteSpace(preferredGasUnit))
-        {
+    @if (!string.IsNullOrWhiteSpace(preferredGasUnit))
+    {
         @:convertGasConsumptionUnits(decodeHTMLEntities('@consumptionUnit'), decodeHTMLEntities('@preferredGasUnit'), false);
     }
 

Views/Vehicle/_GasCostByMonthReport.cshtml

@@ -8,7 +8,7 @@
     var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" };
     var sortedByMPG = Model.OrderBy(x => x.Cost).ToList();
 }
-@if (Model.Where(x=>x.Cost > 0).Any())
+@if (Model.Where(x=>x.Cost > 0).Any() || Model.Where(x=>x.DistanceTraveled > 0).Any())
 {
     <canvas id="bar-chart"></canvas>
     <script>
@@ -16,6 +16,7 @@
         function renderChart() {
             var barGraphLabels = [];
             var barGraphData = [];
+            var lineChartData = [];
             //color gradient from high to low
             var barGraphColors = [];
             var useDarkMode = getGlobalConfig().useDarkMode;
@@ -23,6 +24,7 @@
         {
             @:barGraphLabels.push(decodeHTMLEntities("@gasCost.MonthName"));
             @:barGraphData.push(globalParseFloat('@gasCost.Cost'));
+            @:lineChartData.push(globalParseFloat('@gasCost.DistanceTraveled'));
             var index = sortedByMPG.FindIndex(x => x.MonthName == gasCost.MonthName);
             @:barGraphColors.push('@barGraphColors[index]');
         }
@@ -34,7 +36,18 @@
                             {
                                 label: decodeHTMLEntities('@translator.Translate(userLanguage, "Expenses by Month")'),
                                 backgroundColor: barGraphColors,
-                                data: barGraphData
+                                data: barGraphData,
+                                order: 1,
+                                yAxisID: 'y',
+                            },
+                            {
+                                label: decodeHTMLEntities('@translator.Translate(userLanguage, "Distance Traveled by Month")'),
+                                data: lineChartData,
+                                borderColor: useDarkMode ? "#fff" : "#000",
+                                backgroundColor: useDarkMode ? "#000" : "#fff",
+                                type: 'line',
+                                order: 0,
+                                yAxisID: 'y1',
                             }
                         ]
                     },
@@ -43,7 +56,7 @@
                             title: {
                                 display: true,
                                 color: useDarkMode ? "#fff" : "#000",
-                                text: decodeHTMLEntities('@translator.Translate(userLanguage, "Expenses by Month")')
+                                text: decodeHTMLEntities('@translator.Translate(userLanguage, "Expenses and Distance Traveled by Month")')
                             },
                             legend: {
                                 display: false,
@@ -59,6 +72,13 @@
                                     color: useDarkMode ? "#fff" : "#000"
                                 }
                             },
+                            y1: {
+                                beginAtZero: true,
+                                position: 'right',
+                                ticks: {
+                                    color: useDarkMode ? "#fff" : "#000"
+                                }
+                            },
                             x: {
                                 ticks: {
                                     color: useDarkMode ? "#fff" : "#000"

Views/Vehicle/_GasModal.cshtml

@@ -103,14 +103,14 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.GasRecord.Files)
                             <label for="gasRecordFiles">@translator.Translate(userLanguage,"Upload more documents")</label>
-                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="gasRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="gasRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                         </div>
                     }
                     else
                     {
                         <label for="gasRecordFiles">@translator.Translate(userLanguage,"Upload documents(optional)")</label>
-                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="gasRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="gasRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
                 </div>

Views/Vehicle/_GasRecordsModal.cshtml

@@ -0,0 +1,50 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model GasRecordEditModel
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage,"Edit Multiple Gas Records")</h5>
+    <button type="button" class="btn-close" onclick="hideAddGasRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <label for="gasRecordDate">@translator.Translate(userLanguage, "Date")</label>
+                    <div class="input-group">
+                        <input type="text" id="gasRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                        <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
+                    </div>
+                    <label for="gasRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
+                    <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="gasRecordConsumption">@translator.Translate(userLanguage, "Fuel Consumption")</label>
+                    <input type="text" inputmode="decimal" id="gasRecordConsumption" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="gasRecordCost">@translator.Translate(userLanguage, "Cost")</label>
+                    <input type="text" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="gasRecordTag">@translator.Translate(userLanguage, "Tags(use --- to clear all existing tags)")</label>
+                    <select multiple class="form-select" id="gasRecordTag"></select>
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="gasRecordNotes">@translator.Translate(userLanguage, "Notes(use --- to clear all existing notes)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <textarea id="gasRecordNotes" class="form-control" rows="5"></textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideAddGasRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" class="btn btn-primary" onclick="saveMultipleGasRecordsToVehicle()">@translator.Translate(userLanguage, "Edit")</button>
+</div>
+<script>
+    var recordsToEdit = [];
+    @foreach(int recordId in Model.RecordIds)
+        {
+        @:recordsToEdit.push(@recordId);
+    }
+</script>

Views/Vehicle/_GenericRecordModal.cshtml

@@ -0,0 +1,55 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model GenericRecordEditModel
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage,"Edit Multiple Records")</h5>
+    <button type="button" class="btn-close" onclick="hideGenericRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <label for="genericRecordDate">@translator.Translate(userLanguage,"Date")</label>
+                    <div class="input-group">
+                        <input type="text" id="genericRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                        <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
+                    </div>
+                    <label for="genericRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
+                    <input type="number" inputmode="numeric" id="genericRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="genericRecordDescription">@translator.Translate(userLanguage, "Description")</label>
+                    <input type="text" id="genericRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="genericRecordCost">@translator.Translate(userLanguage, "Cost")</label>
+                    <input type="text" inputmode="decimal" id="genericRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="genericRecordTag">@translator.Translate(userLanguage, "Tags(use --- to clear all existing tags)")</label>
+                    <select multiple class="form-select" id="genericRecordTag"></select>
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="genericRecordNotes">@translator.Translate(userLanguage, "Notes(use --- to clear all existing notes)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <textarea id="genericRecordNotes" class="form-control" rows="5"></textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideGenericRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" class="btn btn-primary" onclick="saveGenericRecord()">@translator.Translate(userLanguage,"Edit")</button>
+</div>
+<script>
+    var recordsToEdit = [];
+    @foreach(int recordId in Model.RecordIds)
+        {
+        @:recordsToEdit.push(@recordId);
+    }
+    function getGenericRecordEditModelData(){
+        return {
+            dataType: decodeHTMLEntities('@Model.DataType.ToString()')
+        }
+    }
+</script>