Merge pull request #493 from hargata/Hargata/persist.dashboard

check against null instead of undefined,

.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/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: lubelogger
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

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

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,8 @@ namespace CarCareTracker.Controllers
         private readonly IReminderHelper _reminderHelper;
         private readonly IGasHelper _gasHelper;
         private readonly IUserLogic _userLogic;
+        private readonly IVehicleLogic _vehicleLogic;
+        private readonly IOdometerLogic _odometerLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IMailHelper _mailHelper;
         private readonly IConfigHelper _config;
@@ -46,7 +47,9 @@ namespace CarCareTracker.Controllers
             IMailHelper mailHelper,
             IFileHelper fileHelper,
             IConfigHelper config,
-            IUserLogic userLogic) 
+            IUserLogic userLogic,
+            IVehicleLogic vehicleLogic,
+            IOdometerLogic odometerLogic) 
         {
             _dataAccess = dataAccess;
             _noteDataAccess = noteDataAccess;
@@ -63,6 +66,8 @@ namespace CarCareTracker.Controllers
             _gasHelper = gasHelper;
             _reminderHelper = reminderHelper;
             _userLogic = userLogic;
+            _odometerLogic = odometerLogic;
+            _vehicleLogic = vehicleLogic;
             _fileHelper = fileHelper;
             _config = config;
         }
@@ -138,8 +143,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 +211,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 +279,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 +335,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);
@@ -344,7 +353,7 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/odometerrecords/latest")]
         public IActionResult LastOdometer(int vehicleId)
         {
-            var result = GetMaxMileage(vehicleId);
+            var result = _vehicleLogic.GetMaxMileage(vehicleId);
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -353,7 +362,12 @@ namespace CarCareTracker.Controllers
         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))]
@@ -384,9 +398,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);
@@ -466,8 +482,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);
@@ -485,7 +502,7 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/reminders")]
         public IActionResult Reminders(int vehicleId)
         {
-            var currentMileage = GetMaxMileage(vehicleId);
+            var currentMileage = _vehicleLogic.GetMaxMileage(vehicleId);
             var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
             var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).Select(x=> new ReminderExportModel {  Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes});
             return Json(results);
@@ -501,7 +518,7 @@ namespace CarCareTracker.Controllers
             {
                 var vehicleId = vehicle.Id;
                 //get reminders
-                var currentMileage = GetMaxMileage(vehicleId);
+                var currentMileage = _vehicleLogic.GetMaxMileage(vehicleId);
                 var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
                 var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).OrderByDescending(x => x.Urgency).ToList();
                 results.RemoveAll(x => !urgencies.Contains(x.Urgency));
@@ -551,35 +568,5 @@ namespace CarCareTracker.Controllers
             var result = _fileHelper.RestoreBackup("/defaults/demo_default.zip", true);
             return Json(result);
         }
-        private int GetMaxMileage(int vehicleId)
-        {
-            var numbersArray = new List<int>();
-            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
-            if (serviceRecords.Any())
-            {
-                numbersArray.Add(serviceRecords.Max(x => x.Mileage));
-            }
-            var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
-            if (repairRecords.Any())
-            {
-                numbersArray.Add(repairRecords.Max(x => x.Mileage));
-            }
-            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
-            if (gasRecords.Any())
-            {
-                numbersArray.Add(gasRecords.Max(x => x.Mileage));
-            }
-            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
-            if (upgradeRecords.Any())
-            {
-                numbersArray.Add(upgradeRecords.Max(x => x.Mileage));
-            }
-            var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
-            if (odometerRecords.Any())
-            {
-                numbersArray.Add(odometerRecords.Max(x => x.Mileage));
-            }
-            return numbersArray.Any() ? numbersArray.Max() : 0;
-        }
     }
 }

Controllers/HomeController.cs

@@ -16,6 +16,7 @@ namespace CarCareTracker.Controllers
         private readonly IVehicleDataAccess _dataAccess;
         private readonly IUserLogic _userLogic;
         private readonly ILoginLogic _loginLogic;
+        private readonly IVehicleLogic _vehicleLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IConfigHelper _config;
         private readonly IExtraFieldDataAccess _extraFieldDataAccess;
@@ -25,6 +26,7 @@ namespace CarCareTracker.Controllers
             IVehicleDataAccess dataAccess,
             IUserLogic userLogic,
             ILoginLogic loginLogic,
+            IVehicleLogic vehicleLogic,
             IConfigHelper configuration,
             IFileHelper fileHelper,
             IExtraFieldDataAccess extraFieldDataAccess,
@@ -40,6 +42,7 @@ namespace CarCareTracker.Controllers
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _reminderHelper = reminderHelper;
             _loginLogic = loginLogic;
+            _vehicleLogic = vehicleLogic;
         }
         private int GetUserID()
         {
@@ -56,7 +59,23 @@ namespace CarCareTracker.Controllers
             {
                 vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
             }
-            return PartialView("_GarageDisplay", vehiclesStored);
+            var vehicleViewModels = vehiclesStored.Select(x => new VehicleViewModel
+            {
+                Id = x.Id,
+                ImageLocation = x.ImageLocation,
+                Year = x.Year,
+                Make = x.Make,
+                Model = x.Model,
+                LicensePlate = x.LicensePlate,
+                SoldDate = x.SoldDate,
+                IsElectric = x.IsElectric,
+                UseHours = x.UseHours,
+                ExtraFields = x.ExtraFields,
+                Tags = x.Tags,
+                LastReportedMileage = _vehicleLogic.GetMaxMileage(x.Id),
+                HasReminders = _vehicleLogic.GetVehicleHasUrgentOrPastDueReminders(x.Id)
+            }).ToList();
+            return PartialView("_GarageDisplay", vehicleViewModels);
         }
         public IActionResult Calendar()
         {
@@ -73,8 +92,7 @@ namespace CarCareTracker.Controllers
                 //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);
+                    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);
                 }
@@ -84,7 +102,7 @@ namespace CarCareTracker.Controllers
         public IActionResult ViewCalendarReminder(int reminderId)
         {
             var reminder = _reminderRecordDataAccess.GetReminderRecordById(reminderId);
-            var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(new List<ReminderRecord> { reminder }, reminder.Mileage + 1000, DateTime.Now).FirstOrDefault();
+            var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(new List<ReminderRecord> { reminder }, 0, DateTime.Now).FirstOrDefault();
             return PartialView("_ReminderRecordCalendarModal", reminderUrgency);
         }
         public IActionResult Settings()
@@ -101,9 +119,23 @@ 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();

Controllers/LoginController.cs

@@ -29,6 +29,18 @@ namespace CarCareTracker.Controllers
         }
         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()
@@ -248,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");
         }
     }
 }

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);
         }
     }
 }

Helper/ConfigHelper.cs

@@ -8,12 +8,17 @@ 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
@@ -29,11 +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"];
@@ -43,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";
@@ -81,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;
@@ -139,9 +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)]),
                 EnableExtraFieldColumns = bool.Parse(_config[nameof(UserConfig.EnableExtraFieldColumns)]),
-                VisibleTabs = _config.GetSection("VisibleTabs").Get<List<ImportMode>>(),
+                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/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/ReminderHelper.cs

@@ -4,51 +4,58 @@ namespace CarCareTracker.Helper
 {
     public interface IReminderHelper
     {
-        ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder);
+        ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, int? currentMileage);
         List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare);
     }
     public class ReminderHelper: IReminderHelper
     {
-        public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder)
+        private readonly IConfigHelper _config;
+        public ReminderHelper(IConfigHelper config)
         {
+            _config = config;
+        }
+        public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, int? currentMileage)
+        {
+            var newDate = currentDate ?? existingReminder.Date;
+            var newMileage = currentMileage ?? existingReminder.Mileage;
             if (existingReminder.Metric == ReminderMetric.Both)
             {
                 if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other)
                 {
-                    existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                    existingReminder.Date = newDate.AddMonths((int)existingReminder.ReminderMonthInterval);
                 } else
                 {
-                    existingReminder.Date = existingReminder.Date.AddMonths(existingReminder.CustomMonthInterval);
+                    existingReminder.Date = newDate.Date.AddMonths(existingReminder.CustomMonthInterval);
                 }
                
                 if (existingReminder.ReminderMileageInterval != ReminderMileageInterval.Other)
                 {
-                    existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
+                    existingReminder.Mileage = newMileage + (int)existingReminder.ReminderMileageInterval;
                 }
                 else
                 {
-                    existingReminder.Mileage += existingReminder.CustomMileageInterval;
+                    existingReminder.Mileage = newMileage + existingReminder.CustomMileageInterval;
                 }
             }
             else if (existingReminder.Metric == ReminderMetric.Odometer)
             {
                 if (existingReminder.ReminderMileageInterval != ReminderMileageInterval.Other)
                 {
-                    existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
+                    existingReminder.Mileage = newMileage + (int)existingReminder.ReminderMileageInterval;
                 } else
                 {
-                    existingReminder.Mileage += existingReminder.CustomMileageInterval;
+                    existingReminder.Mileage = newMileage + existingReminder.CustomMileageInterval;
                 }
             }
             else if (existingReminder.Metric == ReminderMetric.Date)
             {
                 if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other)
                 {
-                    existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                    existingReminder.Date = newDate.AddMonths((int)existingReminder.ReminderMonthInterval);
                 }
                 else
                 {
-                    existingReminder.Date = existingReminder.Date.AddMonths(existingReminder.CustomMonthInterval);
+                    existingReminder.Date = newDate.AddMonths(existingReminder.CustomMonthInterval);
                 }
             }
             return existingReminder;
@@ -56,6 +63,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()
@@ -67,7 +75,8 @@ namespace CarCareTracker.Helper
                     Description = reminder.Description,
                     Notes = reminder.Notes,
                     Metric = reminder.Metric,
-                    IsRecurring = reminder.IsRecurring
+                    IsRecurring = reminder.IsRecurring,
+                    Tags = reminder.Tags
                 };
                 if (reminder.Metric == ReminderMetric.Both)
                 {
@@ -81,24 +90,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 +119,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 +135,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

@@ -25,8 +25,7 @@ namespace CarCareTracker.Helper
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
                 Cost = 0,
-                MaxMileage = x.Max(y => y.Mileage),
-                MinMileage = x.Min(y => y.Mileage)
+                DistanceTraveled = x.Sum(y=>y.DistanceTraveled)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
@@ -39,9 +38,7 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost),
-                MaxMileage = x.Max(y=>y.Mileage),
-                MinMileage = x.Min(y=>y.Mileage)
+                Cost = x.Sum(y => y.Cost)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0)
@@ -54,9 +51,7 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost),
-                MaxMileage = x.Max(y => y.Mileage),
-                MinMileage = x.Min(y => y.Mileage)
+                Cost = x.Sum(y => y.Cost)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0)
@@ -69,9 +64,7 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost),
-                MaxMileage = x.Max(y => y.Mileage),
-                MinMileage = x.Min(y => y.Mileage)
+                Cost = x.Sum(y => y.Cost)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0)
@@ -84,9 +77,7 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost),
-                MaxMileage = x.Max(y => y.Mileage),
-                MinMileage = x.Min(y => y.Mileage)
+                Cost = x.Sum(y => y.Cost)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0)

Helper/StaticHelper.cs

@@ -8,10 +8,12 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
+        public static string VersionNumber = "1.3.1";
         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)
         {
@@ -225,5 +227,65 @@ namespace CarCareTracker.Helper
         {
             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);
+        }
+        public static string GetImportModeIcon(ImportMode importMode)
+        {
+            switch (importMode)
+            {
+                case ImportMode.ServiceRecord:
+                    return "bi-card-checklist";
+                case ImportMode.RepairRecord:
+                    return "bi-exclamation-octagon";
+                case ImportMode.UpgradeRecord:
+                    return "bi-wrench-adjustable";
+                case ImportMode.TaxRecord:
+                    return "bi-currency-dollar";
+                case ImportMode.SupplyRecord:
+                    return "bi-shop";
+                case ImportMode.PlanRecord:
+                    return "bi-bar-chart-steps";
+                case ImportMode.OdometerRecord:
+                    return "bi-speedometer";
+                case ImportMode.GasRecord:
+                    return "bi-fuel-pump";
+                case ImportMode.NoteRecord:
+                    return "bi-journal-bookmark";
+                case ImportMode.ReminderRecord:
+                    return "bi-bell";
+                default:
+                    return "bi-file-bar-graph";
+            }
+        }
     }
 }

Logic/LoginLogic.cs

@@ -35,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)
@@ -412,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)

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/VehicleLogic.cs

@@ -0,0 +1,107 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+
+namespace CarCareTracker.Logic
+{
+    public interface IVehicleLogic
+    {
+        int GetMaxMileage(int vehicleId);
+        int GetMinMileage(int vehicleId);
+        bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId);
+    }
+    public class VehicleLogic: IVehicleLogic
+    {
+        private readonly IServiceRecordDataAccess _serviceRecordDataAccess;
+        private readonly IGasRecordDataAccess _gasRecordDataAccess;
+        private readonly ICollisionRecordDataAccess _collisionRecordDataAccess;
+        private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
+        private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
+        private readonly IReminderHelper _reminderHelper;
+        public VehicleLogic(
+            IServiceRecordDataAccess serviceRecordDataAccess,
+            IGasRecordDataAccess gasRecordDataAccess,
+            ICollisionRecordDataAccess collisionRecordDataAccess,
+            IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            IOdometerRecordDataAccess odometerRecordDataAccess,
+            IReminderRecordDataAccess reminderRecordDataAccess,
+            IReminderHelper reminderHelper
+            ) {
+            _serviceRecordDataAccess = serviceRecordDataAccess;
+            _gasRecordDataAccess = gasRecordDataAccess;
+            _collisionRecordDataAccess = collisionRecordDataAccess;
+            _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _odometerRecordDataAccess = odometerRecordDataAccess;
+            _reminderRecordDataAccess = reminderRecordDataAccess;
+            _reminderHelper = reminderHelper;
+        }
+        public int GetMaxMileage(int vehicleId)
+        {
+            var numbersArray = new List<int>();
+            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+            if (serviceRecords.Any())
+            {
+                numbersArray.Add(serviceRecords.Max(x => x.Mileage));
+            }
+            var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+            if (repairRecords.Any())
+            {
+                numbersArray.Add(repairRecords.Max(x => x.Mileage));
+            }
+            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+            if (gasRecords.Any())
+            {
+                numbersArray.Add(gasRecords.Max(x => x.Mileage));
+            }
+            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+            if (upgradeRecords.Any())
+            {
+                numbersArray.Add(upgradeRecords.Max(x => x.Mileage));
+            }
+            var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            if (odometerRecords.Any())
+            {
+                numbersArray.Add(odometerRecords.Max(x => x.Mileage));
+            }
+            return numbersArray.Any() ? numbersArray.Max() : 0;
+        }
+        public int GetMinMileage(int vehicleId)
+        {
+            var numbersArray = new List<int>();
+            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId).Where(x => x.Mileage != default);
+            if (serviceRecords.Any())
+            {
+                numbersArray.Add(serviceRecords.Min(x => x.Mileage));
+            }
+            var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId).Where(x => x.Mileage != default);
+            if (repairRecords.Any())
+            {
+                numbersArray.Add(repairRecords.Min(x => x.Mileage));
+            }
+            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId).Where(x => x.Mileage != default);
+            if (gasRecords.Any())
+            {
+                numbersArray.Add(gasRecords.Min(x => x.Mileage));
+            }
+            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId).Where(x => x.Mileage != default);
+            if (upgradeRecords.Any())
+            {
+                numbersArray.Add(upgradeRecords.Min(x => x.Mileage));
+            }
+            var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId).Where(x => x.Mileage != default);
+            if (odometerRecords.Any())
+            {
+                numbersArray.Add(odometerRecords.Min(x => x.Mileage));
+            }
+            return numbersArray.Any() ? numbersArray.Min() : 0;
+        }
+        public bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId)
+        {
+            var currentMileage = GetMaxMileage(vehicleId);
+            var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
+            var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
+            return results.Any(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue);
+        }
+    }
+}

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

Models/Collision/CollisionRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public int ReminderRecordId { get; set; }
+        public List<int> ReminderRecordId { get; set; } = new List<int>();
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public bool CopySuppliesAttachment { get; set; } = false;
         public CollisionRecord ToCollisionRecord() { return new CollisionRecord { 
             Id = Id, 
             VehicleId = VehicleId, 

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/OIDC/OpenIDConfig.cs

@@ -11,6 +11,8 @@
         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/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/PlanRecordInput.cs

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

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/Reminder/ReminderRecord.cs

@@ -14,5 +14,6 @@
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
         public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
+        public List<string> Tags { get; set; } = new List<string>();
     }
 }

Models/Reminder/ReminderRecordInput.cs

@@ -14,6 +14,7 @@
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
         public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
+        public List<string> Tags { get; set; } = new List<string>();
         public ReminderRecord ToReminderRecord()
         {
             return new ReminderRecord
@@ -29,7 +30,8 @@
                 ReminderMonthInterval = ReminderMonthInterval,
                 CustomMileageInterval = CustomMileageInterval,
                 CustomMonthInterval = CustomMonthInterval,
-                Notes = Notes
+                Notes = Notes,
+                Tags = Tags
             };
         }
     }

Models/Reminder/ReminderRecordViewModel.cs

@@ -17,5 +17,6 @@
         /// Recurring Reminders
         /// </summary>
         public bool IsRecurring { get; set; } = false;
+        public List<string> Tags { get; set; } = new List<string>();
     }
 }

Models/Report/CostForVehicleByMonth.cs

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

Models/Report/VehicleHistoryViewModel.cs

@@ -13,5 +13,8 @@
         public decimal TotalCostPerMile { get; set; }
         public decimal TotalGasCostPerMile { get; set; }
         public string DistanceUnit { get; set; }
+        public decimal TotalDepreciation { get; set; }
+        public decimal DepreciationPerDay { get; set; }
+        public decimal DepreciationPerMile { get; set; }
     }
 }

Models/SearchResult.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public class SearchResult
+    {
+        public int Id { get; set; }
+        public ImportMode RecordType { get; set; }
+        public string Description { get; set; }
+    }
+}

Models/ServiceRecord/ServiceRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public int ReminderRecordId { get; set; }
+        public List<int> ReminderRecordId { get; set; } = new List<int>();
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public bool CopySuppliesAttachment { get; set; } = false;
         public ServiceRecord ToServiceRecord() { return new ServiceRecord { 
             Id = Id, 
             VehicleId = VehicleId, 

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/SupplyUsageViewModel.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyUsageViewModel
+    {
+        public List<SupplyRecord> Supplies { get; set; } = new List<SupplyRecord>();
+        public List<SupplyUsage> Usage { get; set; } = new List<SupplyUsage>();
+    }
+}

Models/TaxRecord/TaxRecordInput.cs

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

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public int ReminderRecordId { get; set; }
+        public List<int> ReminderRecordId { get; set; } = new List<int>();
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public bool CopySuppliesAttachment { get; set; } = false;
         public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { 
             Id = Id, 
             VehicleId = VehicleId, 

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

@@ -15,8 +15,11 @@
         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

@@ -10,9 +10,20 @@
         public string LicensePlate { get; set; }
         public string PurchaseDate { get; set; }
         public string SoldDate { get; set; }
+        public decimal PurchasePrice { get; set; }
+        public decimal SoldPrice { 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";
     }
 }

Models/VehicleViewModel.cs

@@ -0,0 +1,19 @@
+namespace CarCareTracker.Models
+{
+    public class VehicleViewModel
+    {
+        public int Id { get; set; }
+        public string ImageLocation { get; set; } = "/defaults/noimage.png";
+        public int Year { get; set; }
+        public string Make { get; set; }
+        public string Model { get; set; }
+        public string LicensePlate { 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 int LastReportedMileage;
+        public bool HasReminders = false;
+    }
+}

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,8 @@ builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
 //configure logic
 builder.Services.AddSingleton<ILoginLogic, LoginLogic>();
 builder.Services.AddSingleton<IUserLogic, UserLogic>();
+builder.Services.AddSingleton<IOdometerLogic, OdometerLogic>();
+builder.Services.AddSingleton<IVehicleLogic, VehicleLogic>();
 
 if (!Directory.Exists("data"))
 {
@@ -103,7 +111,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

@@ -22,15 +22,6 @@ LubeLogger is available as both a Docker Image and a Windows Standalone Executab
 
 Read this [Getting Started Guide](https://docs.lubelogger.com/Getting%20Started) on how to download either of them
 
-### 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.
-4. Run `docker build -t lubelogger -f Dockerfile .`
-5. CHECK docker-compose.yml and make sure the mounting directories look correct.
-6. If using traefik, use docker-compose.traefik.yml
-7. Run `docker-compose up`
-
 ### Need Help?
 [Documentation](https://docs.lubelogger.com/)
 

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">
@@ -289,7 +289,7 @@
     <div class="col-1">
         GET
     </div>
-    <div class="col-5">
+    <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords/latest</code>
     </div>
     <div class="col-3">
@@ -303,7 +303,7 @@
     <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">
@@ -314,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()">
@@ -119,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>

Views/Home/_GarageDisplay.cshtml

@@ -1,7 +1,7 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
 @inject ITranslationHelper translator
-@model List<Vehicle>
+@model List<VehicleViewModel>
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
@@ -26,23 +26,42 @@
 }
 <div class="row">
     <div class="row gy-3 align-items-stretch vehiclesContainer">
-        @foreach (Vehicle vehicle in Model)
+        @foreach (VehicleViewModel vehicle in Model)
         {
-            <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>
+            @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>
+                        } else if (vehicle.LastReportedMileage != default)
+                        {
+                            <div class="vehicle-sold-banner">
+                                <div class="d-flex justify-content-between">
+                                    <div>
+                                        <span class="ms-2"><i class="bi bi-speedometer me-2"></i>@vehicle.LastReportedMileage.ToString("N0")</span>
+                                     </div>
+                                    @if (vehicle.HasReminders)
+                                    {
+                                        <div>
+                                            <span class="me-2"><i class="bi bi bi-bell-fill text-warning"></i></span>
+                                        </div>
+                                    }
+                                </div>
+                                <span></span>
+                            </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%;">

Views/Home/_Settings.cshtml

@@ -57,6 +57,10 @@
             <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>
@@ -184,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>
@@ -205,14 +212,14 @@
             <img src="/defaults/lubelogger_logo.png" />
         </div>
         <div class="d-flex justify-content-center">
-            <small class="text-body-secondary">Version 1.2.4</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.
         </p>
         <p class="lead">
             If you enjoyed using this app, please consider spreading the good word.<br />
-            If you are a commercial user, or if you just want to support the development of this project, consider subscribing to <a class="link-light link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://www.patreon.com/LubeLogger" target="_blank">our Patreon</a> or make a <a class="link-light link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://buy.stripe.com/aEU9Egc8DdMc9bO144" target="_blank">donation</a>
+            If you are a commercial user, or if you just want to support the development of this project, consider subscribing to <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://www.patreon.com/LubeLogger" target="_blank">our Patreon</a> or make a <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://buy.stripe.com/aEU9Egc8DdMc9bO144" target="_blank">donation</a>
         </p>
         <div class="d-flex justify-content-center">
             <h6 class="display-7 mt-2">Hometown Shoutout</h6>
@@ -250,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);
@@ -292,6 +346,7 @@
             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(),
@@ -347,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",
@@ -360,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/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

@@ -11,7 +11,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">
@@ -38,6 +38,11 @@
                     <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>

Views/Login/OpenIDRegistration.cshtml

@@ -10,7 +10,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/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

@@ -45,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 {

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

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Repair Record") : translator.Translate(userLanguage,"Edit Repair Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Repair Record") : translator.Translate(userLanguage, "Edit Repair Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditCollisionRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddCollisionRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -17,14 +17,22 @@
             <div class="row">
                 <div class="col-md-6 col-12">
                     <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
-                    <label for="collisionRecordDate">@translator.Translate(userLanguage,"Date")</label>
+                    <label for="collisionRecordDate">@translator.Translate(userLanguage, "Date")</label>
                     <div class="input-group">
                         <input type="text" id="collisionRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"Date repair was performed")" value="@Model.Date">
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
-                    <label for="collisionRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
-                    <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>
+                    <label for="collisionRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
+                    <div class="input-group">
+                        <input type="number" inputmode="numeric" id="collisionRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when repaired")" value="@(isNew ? "" : Model.Mileage)">
+                        @if (isNew)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('collisionRecordMileage')">+</button>
+                            </div>
+                        }
+                    </div>
+                    <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)
                     {
@@ -34,13 +42,13 @@
                             </div>
                         </div>
                     }
-                    <label for="collisionRecordCost">@translator.Translate(userLanguage,"Cost")</label>
+                    <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)
                     {
                         @await Html.PartialAsync("_SupplyStore", "RepairRecord")
                     }
-                    <label for="collisionRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
+                    <label for="collisionRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="collisionRecordTag">
                         @foreach (string tag in Model.Tags)
                         {
@@ -57,15 +65,15 @@
                     }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="collisionRecordNotes">@translator.Translate(userLanguage,"Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <label for="collisionRecordNotes">@translator.Translate(userLanguage, "Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="collisionRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
                         <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">
-                            <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
+                            <label for="collisionRecordFiles">@translator.Translate(userLanguage, "Upload more documents")</label>
+                            <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>
                     }
                     else
@@ -75,13 +83,15 @@
                             <div class="form-check">
                                 <input class="form-check-input" type="checkbox" value="" id="addReminderCheck">
                                 <label class="form-check-label" for="addReminderCheck">
-                                    @translator.Translate(userLanguage,"Add Reminder")
+                                    @translator.Translate(userLanguage, "Add Reminder")
                                 </label>
                             </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">
-                        <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
+                        <label for="collisionRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
+                        <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>
             </div>
@@ -96,39 +106,40 @@
             <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 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">
                 <span class="visually-hidden">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu">
-                <li><h6 class="dropdown-header">@translator.Translate(userLanguage,"Move To")</h6></li>
-                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'RepairRecord', 'ServiceRecord')">@translator.Translate(userLanguage,"Service Records")</a></li>
-                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'RepairRecord', 'UpgradeRecord')">@translator.Translate(userLanguage,"Upgrades")</a></li>
+                <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'RepairRecord', 'ServiceRecord')">@translator.Translate(userLanguage, "Service Records")</a></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'RepairRecord', 'UpgradeRecord')">@translator.Translate(userLanguage, "Upgrades")</a></li>
             </ul>
         </div>
     }
-    <button type="button" class="btn btn-secondary" onclick="hideAddCollisionRecordModal()">@translator.Translate(userLanguage,"Cancel")</button>
+    <button type="button" class="btn btn-secondary" onclick="hideAddCollisionRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
     @if (isNew)
     {
-        <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle()">@translator.Translate(userLanguage,"Add New Repair Record")</button>
+        <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle()">@translator.Translate(userLanguage, "Add New Repair Record")</button>
     }
     else if (!isNew)
     {
-        <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Repair Record")</button>
+        <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;
+    var copySuppliesAttachments = false;
+    var recurringReminderRecordId = [];
     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

@@ -12,6 +12,7 @@
     {
         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">
@@ -48,31 +49,31 @@
                         <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" data-column-toggle='date' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Date" checked>
+                                <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" data-column-toggle='odometer' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Odometer" checked>
+                                <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" data-column-toggle='description' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Description" checked>
+                                <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" data-column-toggle='cost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Cost" checked>
+                                <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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes" checked>
+                                <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>
@@ -81,7 +82,7 @@
                             var elementId = Guid.NewGuid();
                             <li class="dropdown-item">
                                 <div class="list-group-item">
-                                    <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                    <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>
@@ -106,14 +107,14 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
-                    <th scope="col" class="col-2" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
-                    <th scope="col" class="col-3 col-xl-4" data-column="description">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-2" data-column="cost" onclick="toggleSort('accident-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
-                    <th scope="col" class="col-3" data-column="notes">@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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -121,14 +122,26 @@
                 @foreach (CollisionRecord collisionRecord in Model)
                 {
                     <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" data-column="date">@collisionRecord.Date.ToShortDateString()</td>
-                        <td class="col-2" data-column="odometer">@collisionRecord.Mileage</td>
-                        <td class="col-3 col-xl-4" data-column="description">@collisionRecord.Description</td>
-                        <td class="col-2" data-column="cost" data-record-type="cost">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
+                        <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 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(collisionRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <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>
                 }
@@ -156,4 +169,12 @@
     <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>
-</ul>
+    <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

@@ -46,6 +46,7 @@
     {
         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">
@@ -95,49 +96,49 @@
                     <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" data-column-toggle='daterefueled' onChange="showTableColumns(this)" type="checkbox" id="chkCol_DateRefueled" checked>
+                            <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" data-column-toggle='odometer' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Odometer" checked>
+                            <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" data-column-toggle='delta' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Delta" checked>
+                            <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" data-column-toggle='consumption' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Consumption" checked>
+                            <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" data-column-toggle='fueleconomy' onChange="showTableColumns(this)" type="checkbox" id="chkCol_FuelEconomy" checked>
+                            <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" data-column-toggle='cost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Cost" checked>
+                            <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" data-column-toggle='unitcost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_UnitCost" checked>
+                            <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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes">
+                            <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>
@@ -146,7 +147,7 @@
                         var elementId = Guid.NewGuid();
                         <li class="dropdown-item">
                             <div class="list-group-item">
-                                <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                <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>
@@ -170,17 +171,17 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2" data-column="daterefueled">@translator.Translate(userLanguage, "Date Refueled")</th>
-                    <th scope="col" class="col-2" data-column="odometer">@($"{translator.Translate(userLanguage, "Odometer")}({distanceUnit})")</th>
-                    <th scope="col" class="col-1" data-column="delta" style="cursor:pointer;" onclick="toggleSort('gas-tab-pane', this)">@($"Δ({distanceUnit})")</th>
-                    <th scope="col" class="col-2" 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" 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" data-column="cost" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
-                    <th scope="col" class="col-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" style='display:none;' data-column="notes">@translator.Translate(userLanguage, "Notes")</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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -188,17 +189,29 @@
                 @foreach (GasRecordViewModel gasRecord in Model.GasRecords)
                 {
                     <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" data-column="daterefueled">@gasRecord.Date</td>
-                        <td class="col-2" data-column="odometer" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@gasRecord.Mileage</td>
-                        <td class="col-1" data-column="delta">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
-                        <td class="col-2" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
-                        <td class="col-3" 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" data-column="cost" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
-                        <td class="col-1" data-column="unitcost" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
-                        <td class="col-3 text-truncate" style='display:none;' data-column="notes">@StaticHelper.TruncateStrings(gasRecord.Notes)</td>
+                        <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 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(gasRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <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>
                 }
@@ -218,11 +231,17 @@
 <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))
     {

Views/Vehicle/_GasModal.cshtml

@@ -37,7 +37,7 @@
     }
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Gas Record") : translator.Translate(userLanguage,"Edit Gas Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Gas Record") : translator.Translate(userLanguage, "Edit Gas Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditGasRecordModal({Model.GasRecord.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddGasRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -52,7 +52,15 @@
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
                     <label for="gasRecordMileage">@($"{translator.Translate(userLanguage,"Odometer Reading")}({distanceUnit})")</label>
-                    <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when refueled")" value="@(isNew ? "" : Model.GasRecord.Mileage)">
+                    <div class="input-group">
+                        <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when refueled")" value="@(isNew ? "" : Model.GasRecord.Mileage)">
+                        @if (isNew)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('gasRecordMileage')">+</button>
+                            </div>
+                        }
+                    </div>
                     <label for="gasRecordGallons">@($"{translator.Translate(userLanguage, "Fuel Consumption")}({consumptionUnit})")</label>
                     <input type="text" inputmode="decimal" id="gasRecordGallons" class="form-control" placeholder="@translator.Translate(userLanguage,"Amount of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Gallons)">
                     <div class="form-check form-switch">
@@ -103,14 +111,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/_GlobalSearchResult.cshtml

@@ -0,0 +1,34 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model List<SearchResult>
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div style="max-height:50vh; overflow-y:auto;">
+    @if (Model.Any())
+    {
+        @foreach (SearchResult result in Model)
+        {
+            <div class="row border p-2 m-1" onclick="loadGlobalSearchResult(@result.Id, '@result.RecordType')" style="cursor:pointer;">
+                <div class="col-1">
+                    <i class="bi @StaticHelper.GetImportModeIcon(result.RecordType)"></i>
+                </div>
+                <div class="col-11">
+                    @result.Description
+                </div>
+            </div>
+        }
+    } else
+    {
+        <div class="row border p-2 m-1">
+            <div class="col-1">
+                <i class="bi bi-ban"></i>
+            </div>
+            <div class="col-11">
+                @translator.Translate(userLanguage, "No Data Found")
+            </div>
+        </div>
+    }
+</div>

Views/Vehicle/_NoteModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Note") : translator.Translate(userLanguage, "Edit Note"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Note") : translator.Translate(userLanguage, "Edit Note"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditNoteModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddNoteModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -34,14 +34,14 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="serviceRecordFiles">@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="noteFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="noteFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                         </div>
                     }
                     else
                     {
                         <label for="serviceRecordFiles">@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="noteFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="noteFiles">
                         <br />
                         <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }

Views/Vehicle/_OdometerRecordModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Odometer Record") : translator.Translate(userLanguage,"Edit Odometer Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Odometer Record") : translator.Translate(userLanguage, "Edit Odometer Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditOdometerRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddOdometerRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -22,8 +22,18 @@
                         <input type="text" id="odometerRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"Date recorded")" value="@Model.Date">
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
+                    <label for="initialOdometerRecordMileage">@translator.Translate(userLanguage, "Initial Odometer")</label>
+                    <input type="number" inputmode="numeric" id="initialOdometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Initial Odometer reading")" value="@(Model.InitialMileage)">
                     <label for="odometerRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
-                    <input type="number" inputmode="numeric" id="odometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading")" value="@(isNew ? "" : Model.Mileage)">
+                    <div class="input-group">
+                        <input type="number" inputmode="numeric" id="odometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading")" value="@(isNew ? "" : Model.Mileage)">
+                        @if (isNew)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('odometerRecordMileage')">+</button>
+                            </div>
+                        }
+                    </div>
                     <label for="odometerRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="odometerRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -48,14 +58,14 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="odometerRecordFiles">@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="odometerRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="odometerRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                         </div>
                     }
                     else
                     {
                         <label for="odometerRecordFiles">@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="odometerRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="odometerRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
                 </div>

Views/Vehicle/_OdometerRecords.cshtml

@@ -12,12 +12,14 @@
     {
         extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
     }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x=>x.Tab == ImportMode.OdometerRecord);
 }
 @model List<OdometerRecord>
 <div class="row">
     <div class="d-flex justify-content-between">
         <div class="d-flex align-items-center flex-wrap">
             <span class="ms-2 badge bg-success" data-aggregate-type="count">@($"{translator.Translate(userLanguage, "# of Odometer Records")}: {Model.Count()}")</span>
+            <span class="ms-2 badge bg-primary" data-aggregate-type="sum-distance">@($"{translator.Translate(userLanguage, "Total Distance")}: {Model.Sum(x => x.DistanceTraveled)}")</span>
             @foreach (string recordTag in recordTags)
             {
                 <span onclick="filterTable('odometer-tab-pane', this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
@@ -47,19 +49,31 @@
                         <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" data-column-toggle='date' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Date" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'OdometerRecord')" 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" data-column-toggle='odometer' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Odometer" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='initialodometer' onChange="showTableColumns(this, 'OdometerRecord')" type="checkbox" id="chkCol_InitialOdometer" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_InitialOdometer">@translator.Translate(userLanguage, "Initial Odometer")</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, 'OdometerRecord')" 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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='distance' onChange="showTableColumns(this, 'OdometerRecord')" type="checkbox" id="chkCol_Distance" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Distance">@translator.Translate(userLanguage, "Distance")</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, 'OdometerRecord')" type="checkbox" id="chkCol_Notes" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
                             </div>
                         </li>
@@ -68,7 +82,7 @@
                             var elementId = Guid.NewGuid();
                             <li class="dropdown-item">
                                 <div class="list-group-item">
-                                    <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                    <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'OdometerRecord')" type="checkbox" id="@elementId">
                                     <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
                                 </div>
                             </li>
@@ -93,12 +107,14 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
-                    <th scope="col" class="col-3" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
-                    <th scope="col" class="col-7 col-xl-8" data-column="notes">@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-3 flex-grow-1 flex-shrink-1" data-column="initialodometer">@translator.Translate(userLanguage, "Initial Odometer")</th>
+                    <th scope="col" class="col-3 flex-grow-1 flex-shrink-1" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="distance" onclick="toggleSort('odometer-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Distance")</th>
+                    <th scope="col" class="col-2 col-xl-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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -106,12 +122,26 @@
                 @foreach (OdometerRecord odometerRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@odometerRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditOdometerRecordModal,@odometerRecord.Id)" data-tags='@string.Join(" ", odometerRecord.Tags)'>
-                        <td class="col-2 col-xl-1" data-column="date">@odometerRecord.Date.ToShortDateString()</td>
-                        <td class="col-3" data-column="odometer" data-record-type="cost">@odometerRecord.Mileage</td>
-                        <td class="col-7 col-xl-8 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75)</td>
+                        <td class="col-2 col-xl-1 flex-grow-1" data-column="date">@odometerRecord.Date.ToShortDateString()</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1" data-column="initialodometer">@odometerRecord.InitialMileage</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1" data-column="odometer">@odometerRecord.Mileage</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="distance" data-record-type="distance">@(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled)</td>
+                        <td class="col-2 col-xl-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
-                            <td class="col-2 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(odometerRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = odometerRecord.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>
                 }
@@ -131,7 +161,16 @@
 <ul class="table-context-menu dropdown-menu" style="display:none;">
     <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
     <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleOdometerRecords(selectedRow)">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><hr class="context-menu-multiple context-menu-deselect-all dropdown-divider"></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="recalculateDistance()">@translator.Translate(userLanguage, "Recalculate Distance")</a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
-</ul>
+    <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+</ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_OdometerRecordsModal.cshtml

@@ -0,0 +1,48 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model OdometerRecordEditModel
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage,"Edit Multiple Odometer Records")</h5>
+    <button type="button" class="btn-close" onclick="hideAddOdometerRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <label for="odometerRecordDate">@translator.Translate(userLanguage, "Date")</label>
+                    <div class="input-group">
+                        <input type="text" id="odometerRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                        <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
+                    </div>
+                    <label for="initialOdometerRecordMileage">@translator.Translate(userLanguage, "Initial Odometer")</label>
+                    <input type="number" inputmode="numeric" id="initialOdometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="odometerRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
+                    <input type="number" inputmode="numeric" id="odometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <label for="odometerRecordTag">@translator.Translate(userLanguage, "Tags(use --- to clear all existing tags)")</label>
+                    <select multiple class="form-select" id="odometerRecordTag"></select>
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="odometerRecordNotes">@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="odometerRecordNotes" class="form-control" rows="5"></textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideAddOdometerRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" class="btn btn-primary" onclick="saveMultipleOdometerRecordsToVehicle()">@translator.Translate(userLanguage, "Edit")</button>
+</div>
+<script>
+    var recordsToEdit = [];
+    @foreach(int recordId in Model.RecordIds)
+        {
+        @:recordsToEdit.push(@recordId);
+    }
+</script>

Views/Vehicle/_PlanRecordItem.cshtml

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

Views/Vehicle/_PlanRecordModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Plan Record") : translator.Translate(userLanguage, "Edit Plan Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Plan Record") : translator.Translate(userLanguage, "Edit Plan Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditPlanRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddPlanRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -65,14 +65,14 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="planRecordFiles">@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="planRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                         </div>
                     }
                     else
                     {
                         <label for="planRecordFiles">@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="planRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
                         <br />
 
                         <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
@@ -101,10 +101,6 @@
             </button>
             <ul class="dropdown-menu">
                 <li><a class="dropdown-item" href="#" onclick="savePlanRecordTemplate()">@translator.Translate(userLanguage, "Save as Template")</a></li>
-                @if (!Model.CreatedFromReminder)
-                {
-                    <li><a class="dropdown-item" href="#" onclick="showPlanRecordTemplatesModal()">@translator.Translate(userLanguage, "View Templates")</a></li>
-                }
             </ul>
         </div>
     }
@@ -117,6 +113,7 @@
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];
+    var copySuppliesAttachments = false;
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)
@@ -129,7 +126,8 @@
             id: @Model.Id,
             dateCreated: decodeHTMLEntities('@(Model.DateCreated)'),
             reminderRecordId: decodeHTMLEntities('@Model.ReminderRecordId'),
-            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower()
+            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower(),
+            isTemplate: false
         }
     }
 </script>

Views/Vehicle/_PlanRecordTemplateEditModal.cshtml

@@ -0,0 +1,117 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model PlanRecordInput
+@{
+    var isNew = Model.Id == 0;
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage, "Edit Plan Record Template")<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditPlanRecordTemplateModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
+    <button type="button" class="btn-close" onclick="hideAddPlanRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="planRecordDescription">@translator.Translate(userLanguage, "Description")</label>
+                    <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
+                    <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
+                    <input type="text" inputmode="decimal" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
+                    @await Html.PartialAsync("_SupplyStore", "PlanRecordTemplate")
+                    <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
+                    <select class="form-select" id="planRecordType">
+                        <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
+                        <!option value="RepairRecord" @(Model.ImportMode == ImportMode.RepairRecord ? "selected" : "")>@translator.Translate(userLanguage, "Repair")</!option>
+                        <!option value="UpgradeRecord" @(Model.ImportMode == ImportMode.UpgradeRecord ? "selected" : "")>@translator.Translate(userLanguage, "Upgrade")</!option>
+                    </select>
+                    <label for="planRecordPriority">@translator.Translate(userLanguage, "Priority")</label>
+                    <select class="form-select" id="planRecordPriority">
+                        <!option value="Critical" @(Model.Priority == PlanPriority.Critical ? "selected" : "")>@translator.Translate(userLanguage, "Critical")</!option>
+                        <!option value="Normal" @(Model.Priority == PlanPriority.Normal || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Normal")</!option>
+                        <!option value="Low" @(Model.Priority == PlanPriority.Low ? "selected" : "")>@translator.Translate(userLanguage, "Low")</!option>
+                    </select>
+                    <label for="planRecordProgress">@translator.Translate(userLanguage, "Current Stage")</label>
+                    <select class="form-select" id="planRecordProgress">
+                        <!option value = "Backlog" @(Model.Progress == PlanProgress.Backlog || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Planned")</!option>
+                        <!option value="InProgress" @(Model.Progress == PlanProgress.InProgress ? "selected" : "")>@translator.Translate(userLanguage, "Doing")</!option>
+                        <!option value = "Testing" @(Model.Progress == PlanProgress.Testing ? "selected" : "")>@translator.Translate(userLanguage, "Testing")</!option>
+                    </select>
+                    @foreach (ExtraField field in Model.ExtraFields)
+                    {
+                        var elementId = Guid.NewGuid();
+                        <div class="extra-field">
+                            <label for="@elementId">@field.Name</label>
+                            <input type="text" id="@elementId" class="form-control @(field.IsRequired ? "extra-field-required" : "")" placeholder="@field.Name" value="@field.Value">
+                        </div>
+                    }
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="planRecordNotes">@translator.Translate(userLanguage, "Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <textarea id="planRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @await Html.PartialAsync("_UploadedFiles", Model.Files)
+                            <label for="planRecordFiles">@translator.Translate(userLanguage, "Upload more documents")</label>
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
+                            <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        </div>
+                    }
+                    else
+                    {
+                        <label for="planRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
+                        <br />
+
+                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<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>
+        }
+        <button type="button" class="btn btn-danger" onclick="deletePlannerRecordTemplate(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage, "Delete")</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" class="btn btn-primary" onclick="savePlanRecordTemplate(true)">@translator.Translate(userLanguage, "Edit Plan Record Template")</button>
+</div>
+@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+<script>
+    var uploadedFiles = [];
+    var selectedSupplies = [];
+    var copySuppliesAttachments = @Model.CopySuppliesAttachment.ToString().ToLower();
+    getUploadedFilesFromModel();
+    getSelectedSuppliesFromModel();
+    function getUploadedFilesFromModel() {
+        @foreach (UploadedFiles filesUploaded in Model.Files)
+        {
+            @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+        }
+    }
+    function getSelectedSuppliesFromModel() {
+        @foreach(SupplyUsage supplyUsage in Model.Supplies)
+        {
+        @:selectedSupplies.push({supplyId: @supplyUsage.SupplyId, quantity: @supplyUsage.Quantity})
+        }
+    }
+    function getPlanRecordModelData() {
+        return {
+            id: @Model.Id,
+            dateCreated: decodeHTMLEntities('@(Model.DateCreated)'),
+            reminderRecordId: decodeHTMLEntities('@Model.ReminderRecordId'),
+            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower(),
+            isTemplate: true
+        }
+    }
+</script>

Views/Vehicle/_PlanRecordTemplateModal.cshtml

@@ -20,7 +20,7 @@
                         <tr class="d-flex">
                             <th scope="col" class="col-8">@translator.Translate(userLanguage,"Description")</th>
                             <th scope="col" class="col-2">@translator.Translate(userLanguage, "Use")</th>
-                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Delete")</th>
+                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Edit")</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -67,7 +67,7 @@
                                     }
                                 </td>
                                 <td class="col-2"><button type="button" class="btn btn-primary" onclick="usePlannerRecordTemplate(@planRecordTemplate.Id)"><i class="bi bi-plus-square"></i></button></td>
-                                <td class="col-2"><button type="button" class="btn btn-danger" onclick="deletePlannerRecordTemplate(@planRecordTemplate.Id)"><i class="bi bi-trash"></i></button></td>
+                                <td class="col-2"><button type="button" class="btn btn-warning" onclick="showEditPlanRecordTemplateModal(@planRecordTemplate.Id)"><i class="bi bi-pencil-square"></i></button></td>
                             </tr>
                         }
                     </tbody>

Views/Vehicle/_PlanRecords.cshtml

@@ -28,6 +28,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('PlanRecord')">@translator.Translate(userLanguage,"Import via CSV")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('PlanRecord')">@translator.Translate(userLanguage,"Export to CSV")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="showPlanRecordTemplatesModal()">@translator.Translate(userLanguage, "View Templates")</a></li>
                     </ul>
                 </div>
             }
@@ -102,7 +104,7 @@
     </div>
 </div>
 
-<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="planRecordTemplateModalContent">
         </div>

Views/Vehicle/_RecurringReminderSelector.cshtml

@@ -1,4 +1,18 @@
-@model List<ReminderRecord>
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@model List<ReminderRecord>
+@if (Model.Count() > 1)
+{
+    <div class="mb-2">
+        <input class="form-check-input" type="checkbox" onchange="showMultipleRemindersSelector()" id="multipleRemindersCheck">
+        <label class="form-check-label" for="multipleRemindersCheck">@translator.Translate(userLanguage, "Multiple")</label>
+    </div>
+}
 <select class="form-select" id="recurringReminderInput">
     @if (Model.Any())
     {
@@ -10,4 +24,15 @@
     {
         <!option value="0">No Recurring Reminders Found</!option>
     }
-</select>
+</select>
+<div id="recurringMultipleReminders" style="display:none;">
+    <ul class="list-group">
+        @foreach (ReminderRecord reminderRecord in Model)
+        {
+            <li class="list-group-item text-start">
+                <input class="form-check-input" type="checkbox" value="@reminderRecord.Id" id="recurringReminder_@reminderRecord.Id">
+                <label class="form-check-label stretched-link" for="recurringReminder_@reminderRecord.Id">@reminderRecord.Description</label>
+            </li>
+        }
+    </ul>
+</div>

Views/Vehicle/_ReminderRecordModal.cshtml

@@ -34,14 +34,25 @@
                     </div>     
                     <div class="input-group">
                         <input type="number" inputmode="numeric" id="reminderMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Future Odometer Reading")" value="@(isNew ? "" : Model.Mileage)">
-                        <div class="input-group-text">
-                            <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="appendMileageToOdometer(500)">+500</button>
-                        </div>
+                        @if (isNew)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('reminderMileage')">+</button>
+                            </div>
+                        }
                     </div>
                     <div class="form-check form-check-inline">
                         <input class="form-check-input" type="radio" name="reminderMetricOptions" id="reminderMetricBoth" value="@(ReminderMetric.Both)" checked="@(Model.Metric == ReminderMetric.Both)">
                         <label class="form-check-label" for="reminderMetricBoth">@translator.Translate(userLanguage,"Whichever comes first")</label>
                     </div>
+                    <div class="d-grid"></div>
+                    <label for="reminderRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
+                    <select multiple class="form-select" id="reminderRecordTag">
+                        @foreach (string tag in Model.Tags)
+                        {
+                            <!option value="@tag">@tag</!option>
+                        }
+                    </select>
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="reminderNotes">@translator.Translate(userLanguage,"Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>

Views/Vehicle/_ReminderRecords.cshtml

@@ -6,15 +6,26 @@
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
     var hasRefresh = Model.Where(x => (x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue) && x.IsRecurring).Any();
+    var recordTags = Model.SelectMany(x => x.Tags).Distinct();
 }
 <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">@($"{translator.Translate(userLanguage, "# of Reminders")}: {Model.Count()}")</span>
-            <span class="ms-2 badge bg-secondary">@($"{translator.Translate(userLanguage, "Past Due")}: {Model.Where(x => x.Urgency == ReminderUrgency.PastDue).Count()}")</span>
-            <span class="ms-2 badge bg-danger">@($"{translator.Translate(userLanguage, "Very Urgent")}: {Model.Where(x=>x.Urgency == ReminderUrgency.VeryUrgent).Count()}")</span>
-            <span class="ms-2 badge bg-warning">@($"{translator.Translate(userLanguage, "Urgent")}: {Model.Where(x => x.Urgency == ReminderUrgency.Urgent).Count()}")</span>
-            <span class="ms-2 badge bg-success">@($"{translator.Translate(userLanguage, "Not Urgent")}: {Model.Where(x => x.Urgency == ReminderUrgency.NotUrgent).Count()}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="count">@($"{translator.Translate(userLanguage, "# of Reminders")}: {Model.Count()}")</span>
+            <span class="ms-2 badge bg-secondary" data-aggregate-type="pastdue-count">@($"{translator.Translate(userLanguage, "Past Due")}: {Model.Where(x => x.Urgency == ReminderUrgency.PastDue).Count()}")</span>
+            <span class="ms-2 badge bg-danger" data-aggregate-type="veryurgent-count">@($"{translator.Translate(userLanguage, "Very Urgent")}: {Model.Where(x => x.Urgency == ReminderUrgency.VeryUrgent).Count()}")</span>
+            <span class="ms-2 badge text-bg-warning" data-aggregate-type="urgent-count">@($"{translator.Translate(userLanguage, "Urgent")}: {Model.Where(x => x.Urgency == ReminderUrgency.Urgent).Count()}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="noturgent-count">@($"{translator.Translate(userLanguage, "Not Urgent")}: {Model.Where(x => x.Urgency == ReminderUrgency.NotUrgent).Count()}")</span>
+            @foreach (string recordTag in recordTags)
+            {
+                <span onclick="filterReminderTable(this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
+            }
+            <datalist id="tagList">
+                @foreach (string recordTag in recordTags)
+                {
+                    <!option value="@recordTag"></!option>
+                }
+            </datalist>
         </div>
         <div>
             <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
@@ -33,34 +44,34 @@
                 <tr class="d-flex">
                     <th scope="col" class="col-1">@translator.Translate(userLanguage, "Urgency")</th>
                     <th scope="col" class="col-2">@translator.Translate(userLanguage, "Metric")</th>
-                    <th scope="col" class="@(hasRefresh ? "col-4" : "col-5")">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-3">@translator.Translate(userLanguage, "Notes")</th>
+                    <th scope="col" class="@(hasRefresh ? "col-3 col-md-4" : "col-5")">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" class="col-2 col-md-3">@translator.Translate(userLanguage, "Notes")</th>
                     @if (hasRefresh)
                     {
-                        <th scope="col" class="col-1">@translator.Translate(userLanguage, "Done")</th>
+                        <th scope="col" class="col-2 col-md-1">@translator.Translate(userLanguage, "Done")</th>
                     }
-                    <th scope="col" class="col-1">@translator.Translate(userLanguage, "Delete")</th>
+                    <th scope="col" class="col-2 col-md-1">@translator.Translate(userLanguage, "Delete")</th>
                 </tr>
             </thead>
             <tbody>
                 @foreach (ReminderRecordViewModel reminderRecord in Model)
                 {
-                    <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@reminderRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditReminderRecordModal,@reminderRecord.Id)">
+                    <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@reminderRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditReminderRecordModal,@reminderRecord.Id)" data-tags='@string.Join(" ", reminderRecord.Tags)'>
                         @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent)
                         {
-                            <td class="col-1"><span class="badge text-bg-danger">@translator.Translate(userLanguage, "Very Urgent")</span></td>
+                            <td class="col-1"><span class="text-danger d-inline-block d-md-none"><i class="bi bi-hourglass-split h3"></i></span><span class="badge text-bg-danger d-none d-md-inline-block">@translator.Translate(userLanguage, "Very Urgent")</span></td>
                         }
                         else if (reminderRecord.Urgency == ReminderUrgency.Urgent)
                         {
-                            <td class="col-1"><span class="badge text-bg-warning">@translator.Translate(userLanguage, "Urgent")</span></td>
+                            <td class="col-1"><span class="text-warning d-inline-block d-md-none"><i class="bi bi-hourglass-split h3"></i></span><span class="badge text-bg-warning d-none d-md-inline-block">@translator.Translate(userLanguage, "Urgent")</span></td>
                         }
                         else if (reminderRecord.Urgency == ReminderUrgency.PastDue)
                         {
-                            <td class="col-1"><span class="badge text-bg-secondary">@translator.Translate(userLanguage, "Past Due")</span></td>
+                            <td class="col-1"><span class="text-secondary d-inline-block d-md-none"><i class="bi bi-hourglass-bottom h3"></i></span><span class="badge text-bg-secondary d-none d-md-inline-block">@translator.Translate(userLanguage, "Past Due")</span></td>
                         }
                         else
                         {
-                            <td class="col-1"><span class="badge text-bg-success">@translator.Translate(userLanguage, "Not Urgent")</span></td>
+                            <td class="col-1"><span class="text-success d-inline-block d-md-none"><i class="bi bi-hourglass-top h3"></i></span><span class="badge text-bg-success d-none d-md-inline-block">@translator.Translate(userLanguage, "Not Urgent")</span></td>
                         }
                         @if (reminderRecord.Metric == ReminderMetric.Date)
                         {
@@ -74,18 +85,18 @@
                         {
                             <td class="col-2">@reminderRecord.Metric</td>
                         }
-                        <td class="@(hasRefresh ? "col-4" : "col-5")">@reminderRecord.Description</td>
-                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
+                        <td class="@(hasRefresh ? "col-3 col-md-4" : "col-5")" data-record-type='cost'>@reminderRecord.Description</td>
+                        <td class="col-2 col-md-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
                         @if (hasRefresh)
                         {
-                            <td class="col-1 text-truncate">
+                            <td class="col-2 col-md-1 text-truncate">
                                 @if((reminderRecord.Urgency == ReminderUrgency.VeryUrgent || reminderRecord.Urgency == ReminderUrgency.PastDue) && reminderRecord.IsRecurring)
                                 {
                                     <button type="button" class="btn btn-secondary" onclick="markDoneReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-check-lg"></i></button>
                                 }
                             </td>
                         }
-                        <td class="col-1 text-truncate">
+                        <td class="col-2 col-md-1 text-truncate">
                             <button type="button" class="btn btn-danger" onclick="deleteReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-trash"></i></button>
                         </td>
                     </tr>

Views/Vehicle/_Report.cshtml

@@ -117,6 +117,9 @@
             </div>
         </div>
         <div class="col-md-3 col-12 chartContainer">
+            <div class="d-grid">
+                <button onclick="showGlobalSearch()" class="btn btn-secondary btn-md mt-1 mb-1">@translator.Translate(userLanguage, "Search")<i class="bi ms-2 bi-search"></i></button>
+            </div>
             <div class="d-grid">
                 <button onclick="generateVehicleHistoryReport()" class="btn btn-secondary btn-md mt-1 mb-1">@translator.Translate(userLanguage, "Vehicle Maintenance Report")<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
             </div>
@@ -126,4 +129,25 @@
         </div>
     </div>
 </div>
-<div id="vehicleHistoryReport" class="showOnPrint"></div>
+<div class="modal fade" data-bs-focus="false" id="globalSearchModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="globalSearchModalContent">
+            <div class="modal-body">
+                <div class="input-group input-group-lg">
+                    <input type="text" id="globalSearchInput" autocomplete="off" onkeyup="handleGlobalSearchKeyPress(event)" class="form-control" placeholder="@translator.Translate(userLanguage,"Search by Keyword(Case Sensitive)")">
+                    <button type="button" class="btn btn-outline-secondary" onclick="performGlobalSearch()"><i class="bi bi-search"></i></button>
+                </div>
+                <div class="form-check form-switch mt-1">
+                    <input class="form-check-input" type="checkbox" role="switch" id="globalSearchAutoSearchCheck" checked>
+                    <label class="form-check-label" for="globalSearchAutoSearchCheck">@translator.Translate(userLanguage, "Incremental Search")</label>
+                </div>
+                <div id="globalSearchModalResults"></div>
+            </div>
+        </div>
+    </div>
+</div>
+<div id="vehicleHistoryReport" class="showOnPrint"></div>
+
+<script>
+    getSelectedMetrics();
+</script>

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Service Record") : translator.Translate(userLanguage,"Edit Service Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Service Record") : translator.Translate(userLanguage, "Edit Service Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditServiceRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddServiceRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -22,8 +22,16 @@
                         <input type="text" id="serviceRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"Date service was performed")" value="@Model.Date">
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
-                    <label for="serviceRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
-                    <input type="number" inputmode="numeric" id="serviceRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when serviced")" value="@(isNew ? "" : Model.Mileage)">
+                    <label for="serviceRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
+                    <div class="input-group">
+                        <input type="number" inputmode="numeric" id="serviceRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when serviced")" value="@(isNew ? "" : Model.Mileage)">
+                        @if (isNew)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('serviceRecordMileage')">+</button>
+                            </div>
+                        }
+                    </div>
                     <label for="serviceRecordDescription">@translator.Translate(userLanguage,"Description")</label>
                     <input type="text" id="serviceRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of item(s) serviced(i.e. Oil Change)")" value="@Model.Description">
                     @if (isNew)
@@ -64,7 +72,7 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="serviceRecordFiles">@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="serviceRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="serviceRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                         </div>
                     }
@@ -80,7 +88,7 @@
                             </div>
                         }
                         <label for="serviceRecordFiles">@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="serviceRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="serviceRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
                 </div>
@@ -121,7 +129,8 @@
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];
-    var recurringReminderRecordId = 0;
+    var recurringReminderRecordId = [];
+    var copySuppliesAttachments = false;
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)

Views/Vehicle/_ServiceRecords.cshtml

@@ -12,6 +12,7 @@
     {
         extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
     }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.ServiceRecord);
 }
 @model List<ServiceRecord>
 <div class="row">
@@ -48,31 +49,31 @@
                         <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" data-column-toggle='date' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Date" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'ServiceRecord')" 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" data-column-toggle='odometer' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Odometer" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='odometer' onChange="showTableColumns(this, 'ServiceRecord')" 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" data-column-toggle='description' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Description" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'ServiceRecord')" 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" data-column-toggle='cost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Cost" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='cost' onChange="showTableColumns(this, 'ServiceRecord')" 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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'ServiceRecord')" type="checkbox" id="chkCol_Notes" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
                             </div>
                         </li>
@@ -81,7 +82,7 @@
                             var elementId = Guid.NewGuid();
                             <li class="dropdown-item">
                                 <div class="list-group-item">
-                                    <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                    <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'ServiceRecord')" type="checkbox" id="@elementId">
                                     <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
                                 </div>
                             </li>
@@ -106,14 +107,14 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
-                    <th scope="col" class="col-2" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
-                    <th scope="col" class="col-3 col-xl-4" data-column="description">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-2" data-column="cost" onclick="toggleSort('servicerecord-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
-                    <th scope="col" class="col-3" data-column="notes">@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('servicerecord-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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -121,14 +122,24 @@
                 @foreach (ServiceRecord serviceRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@serviceRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditServiceRecordModal,@serviceRecord.Id)" data-tags='@string.Join(" ", serviceRecord.Tags)'>
-                        <td class="col-2 col-xl-1" data-column="date">@serviceRecord.Date.ToShortDateString()</td>
-                        <td class="col-2" data-column="odometer">@serviceRecord.Mileage</td>
-                        <td class="col-3 col-xl-4" data-column="description">@serviceRecord.Description</td>
-                        <td class="col-2" data-column="cost" data-record-type="cost">@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes)</td>
+                        <td class="col-2 col-xl-1 flex-grow-1" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(serviceRecord.Date)">@serviceRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@serviceRecord.Mileage</td>
+                        <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1" data-column="description">@serviceRecord.Description</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))</td>
+                        <td class="col-3 text-truncate flex-grow-1 flex-shrink-1" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
-                            <td class="col-2 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(serviceRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = serviceRecord.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>
                 }
@@ -156,4 +167,12 @@
     <li><hr class="dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ServiceRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'ServiceRecord')">@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, 'ServiceRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
 </ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Supply Record") : translator.Translate(userLanguage,"Edit Supply Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Supply Record") : translator.Translate(userLanguage, "Edit Supply Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditSupplyRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddSupplyRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -67,14 +67,14 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="supplyRecordFiles">@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="supplyRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="supplyRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                         </div>
                     }
                     else
                     {
                         <label for="supplyRecordFiles">@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="supplyRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="supplyRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
                 </div>

Views/Vehicle/_SupplyRecords.cshtml

@@ -12,6 +12,7 @@
     {
         extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
     }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.SupplyRecord);
 }
 @model List<SupplyRecord>
 <div class="row">
@@ -48,43 +49,43 @@
                         <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" data-column-toggle='date' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Date" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'SupplyRecord')" 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" data-column-toggle='partnumber' onChange="showTableColumns(this)" type="checkbox" id="chkCol_PartNumber" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='partnumber' onChange="showTableColumns(this, 'SupplyRecord')" type="checkbox" id="chkCol_PartNumber" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_PartNumber">@translator.Translate(userLanguage, "Part Number")</label>
                             </div>
                         </li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
-                                <input class="form-check-input" data-column-toggle='supplier' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Supplier" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='supplier' onChange="showTableColumns(this, 'SupplyRecord')" type="checkbox" id="chkCol_Supplier" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Supplier">@translator.Translate(userLanguage, "Supplier")</label>
                             </div>
                         </li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
-                                <input class="form-check-input" data-column-toggle='description' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Description" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'SupplyRecord')" 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" data-column-toggle='quantity' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Quantity" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='quantity' onChange="showTableColumns(this, 'SupplyRecord')" type="checkbox" id="chkCol_Quantity" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Quantity">@translator.Translate(userLanguage, "Quantity")</label>
                             </div>
                         </li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
-                                <input class="form-check-input" data-column-toggle='cost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Cost" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='cost' onChange="showTableColumns(this, 'SupplyRecord')" 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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'SupplyRecord')" type="checkbox" id="chkCol_Notes" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
                             </div>
                         </li>
@@ -93,7 +94,7 @@
                             var elementId = Guid.NewGuid();
                             <li class="dropdown-item">
                                 <div class="list-group-item">
-                                    <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                    <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'SupplyRecord')" type="checkbox" id="@elementId">
                                     <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
                                 </div>
                             </li>
@@ -118,16 +119,16 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
-                    <th scope="col" class="col-2" data-column="partnumber">@translator.Translate(userLanguage, "Part #")</th>
-                    <th scope="col" class="col-2" data-column="supplier">@translator.Translate(userLanguage, "Supplier")</th>
-                    <th scope="col" class="col-2 col-xl-3" data-column="description">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-1" data-column="quantity" onclick="toggleSort('supply-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Quantity")</th>
-                    <th scope="col" class="col-1" data-column="cost" onclick="toggleSort('supply-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
-                    <th scope="col" class="col-2" data-column="notes">@translator.Translate(userLanguage, "Notes")</th>
+                    <th scope="col" class="col-2 flex-grow-1 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="partnumber">@translator.Translate(userLanguage, "Part #")</th>
+                    <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="supplier">@translator.Translate(userLanguage, "Supplier")</th>
+                    <th scope="col" class="col-2 flex-grow-1 col-xl-3" data-column="description">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" class="col-1 flex-grow-1 flex-shrink-1" data-column="quantity" onclick="toggleSort('supply-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Quantity")</th>
+                    <th scope="col" class="col-1 flex-grow-1 flex-shrink-1" data-column="cost" onclick="toggleSort('supply-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
+                    <th scope="col" class="col-2 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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -135,16 +136,28 @@
                 @foreach (SupplyRecord supplyRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@supplyRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditSupplyRecordModal,@supplyRecord.Id)" data-tags='@string.Join(" ", supplyRecord.Tags)'>
-                        <td class="col-2 col-xl-1" data-column="date">@supplyRecord.Date.ToShortDateString()</td>
-                        <td class="col-2" data-column="partnumber">@supplyRecord.PartNumber</td>
-                        <td class="col-2" data-column="supplier">@supplyRecord.PartSupplier</td>
-                        <td class="col-2 col-xl-3" data-column="description">@supplyRecord.Description</td>
-                        <td class="col-1" data-column="quantity">@supplyRecord.Quantity</td>
-                        <td class="col-1" data-column="cost" data-record-type="cost">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
-                        <td class="col-2 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes)</td>
+                        <td class="col-2 flex-grow-1 col-xl-1" data-column="date">@supplyRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="partnumber">@supplyRecord.PartNumber</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="supplier">@supplyRecord.PartSupplier</td>
+                        <td class="col-2 flex-grow-1 col-xl-3" data-column="description">@supplyRecord.Description</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1" data-column="quantity">@supplyRecord.Quantity</td>
+                        <td class="col-1 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
-                            <td class="col-2 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(supplyRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = supplyRecord.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>
                 }
@@ -167,4 +180,8 @@
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'SupplyRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'SupplyRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
-</ul>
+</ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_SupplyStore.cshtml

@@ -33,10 +33,12 @@
                 $('#upgradeRecordCost').val(selectedSupplyResult.totalSum);
                 break;
             case "PlanRecord":
+            case "PlanRecordTemplate":
                 $('#planRecordCost').val(selectedSupplyResult.totalSum);
                 break;
         }
         selectedSupplies = getSuppliesAndQuantity().selectedSupplies;
+        copySuppliesAttachments = $("#inputCopySuppliesAttachments").is(':checked');
         hideSuppliesModal();
     }
     function hideParentModal(){
@@ -52,6 +54,7 @@
                 $('#upgradeRecordModal').modal('hide');
                 break;
             case "PlanRecord":
+            case "PlanRecordTemplate":
                 $('#planRecordModal').modal('hide');
                 break;
         }
@@ -69,6 +72,7 @@
                 $('#upgradeRecordModal').modal('show');
                 break;
             case "PlanRecord":
+            case "PlanRecordTemplate":
                 $('#planRecordModal').modal('show');
                 break;
         }
@@ -82,14 +86,30 @@
         }
     }
     function getSupplies() {
-        var vehicleId = GetVehicleId().vehicleId;
-        $.get(`/Vehicle/GetSupplyRecordsForRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
-            if (data) {
-                hideParentModal();
-                $("#inputSuppliesModalContent").html(data);
-                $('#inputSuppliesModal').modal('show');
-            }
-        })
+        var caller = GetCaller().tab;
+        if (caller == 'PlanRecordTemplate') {
+            var planRecordTemplateId = getPlanRecordModelData().id;
+            $.get(`/Vehicle/GetSupplyRecordsForPlanRecordTemplate?planRecordTemplateId=${planRecordTemplateId}`, function (data) {
+                if (data) {
+                    hideParentModal();
+                    $("#inputSuppliesModalContent").html(data);
+                    $('#inputSuppliesModal').modal('show');
+                    recalculateTotal();
+                    if (copySuppliesAttachments) {
+                        $('#inputCopySuppliesAttachments').attr('checked', true);
+                    }
+                }
+            });
+        } else {
+            var vehicleId = GetVehicleId().vehicleId;
+            $.get(`/Vehicle/GetSupplyRecordsForRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
+                if (data) {
+                    hideParentModal();
+                    $("#inputSuppliesModalContent").html(data);
+                    $('#inputSuppliesModal').modal('show');
+                }
+            });
+        }
     }
     function hideSuppliesModal() {
         $('#inputSuppliesModal').modal('hide');

Views/Vehicle/_SupplyUsage.cshtml

@@ -4,15 +4,15 @@
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
-    var recordTags = Model.SelectMany(x => x.Tags).Distinct();
+    var recordTags = Model.Supplies.SelectMany(x => x.Tags).Distinct();
 }
-@model List<SupplyRecord>
+@model SupplyUsageViewModel
 <div class="modal-header">
     <h5 class="modal-title">@translator.Translate(userLanguage,"Select Supplies")</h5>
     <button type="button" class="btn-close" onclick="hideSuppliesModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
-    @if (Model.Any())
+    @if (Model.Supplies.Any())
     {
         <div class="row">
             <div class="col-12" style="max-height:50vh; overflow-y:auto;" id="supplies-table">
@@ -37,11 +37,12 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (SupplyRecord supplyRecord in Model)
+                        @foreach (SupplyRecord supplyRecord in Model.Supplies)
                         {
+                            var supplyUsage = Model.Usage.Where(x => x.SupplyId == supplyRecord.Id).SingleOrDefault();
                             <tr class="d-flex" id="supplyRows" data-tags='@string.Join(" ", supplyRecord.Tags)'>
-                                <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id"></td>
-                                <td class="col-2"><input type="text" inputmode="decimal" disabled onchange="recalculateTotal()" class="form-control"></td>
+                                <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id" @(supplyUsage == default ? "" : "checked")></td>
+                                <td class="col-2"><input type="text" inputmode="decimal" @(supplyUsage == default ? "disabled" : "") value="@(supplyUsage == default ? "" : supplyUsage.Quantity)" onchange="recalculateTotal()" class="form-control"></td>
                                 <td class="col-2 supplyquantity">@supplyRecord.Quantity</td>
                                 <td class="col-2 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.PartNumber)</td>
                                 <td class="col-3 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.Description)</td>
@@ -66,6 +67,10 @@
 </div>
 <div class="modal-footer">
     <span id="supplySumLabel" style="margin-right:auto;">Total: 0.00</span>
+    <div class="form-check form-switch">
+        <input class="form-check-input" type="checkbox" role="switch" id="inputCopySuppliesAttachments">
+        <label class="form-check-label" for="inputCopySuppliesAttachments">@translator.Translate(userLanguage, "Copy Attachments")</label>
+    </div>
     <button type="button" class="btn btn-secondary" onclick="hideSuppliesModal()">@translator.Translate(userLanguage, "Cancel")</button>
     <button type="button" class="btn btn-primary" disabled id="selectSuppliesButton" onclick="selectSupplies()">@translator.Translate(userLanguage, "Select")</button>
 </div>

Views/Vehicle/_TaxRecordModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Tax Record") : translator.Translate(userLanguage,"Edit Tax Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Tax Record") : translator.Translate(userLanguage, "Edit Tax Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditTaxRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddTaxRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -73,7 +73,7 @@
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
                             <label for="taxRecordFiles">@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="taxRecordFiles">
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="taxRecordFiles">
                             <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                         </div>
                     }
@@ -89,7 +89,7 @@
                             </div>
                         }
                         <label for="taxRecordFiles">@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="taxRecordFiles">
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="taxRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
                 </div>
@@ -115,7 +115,7 @@
 <script>
     var uploadedFiles = [];
     var customMonthInterval = @Model.CustomMonthInterval;
-    var recurringReminderRecordId = 0;
+    var recurringReminderRecordId = [];
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)

Views/Vehicle/_TaxRecords.cshtml

@@ -12,6 +12,7 @@
     {
         extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
     }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.TaxRecord);
 }
 @model List<TaxRecord>
 <div class="row">
@@ -48,25 +49,25 @@
                         <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" data-column-toggle='date' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Date" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'TaxRecord')" 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" data-column-toggle='description' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Description" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'TaxRecord')" 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" data-column-toggle='cost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Cost" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='cost' onChange="showTableColumns(this, 'TaxRecord')" 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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'TaxRecord')" type="checkbox" id="chkCol_Notes" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
                             </div>
                         </li>
@@ -75,7 +76,7 @@
                             var elementId = Guid.NewGuid();
                             <li class="dropdown-item">
                                 <div class="list-group-item">
-                                    <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                    <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'TaxRecord')" type="checkbox" id="@elementId">
                                     <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
                                 </div>
                             </li>
@@ -100,13 +101,13 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-3 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
-                    <th scope="col" class="col-4 col-xl-6" data-column="description">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-2" data-column="cost" onclick="toggleSort('tax-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
-                    <th scope="col" class="col-3" data-column="notes">@translator.Translate(userLanguage, "Notes")</th>
+                    <th scope="col" class="col-3 flex-grow-1 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
+                    <th scope="col" class="col-4 flex-grow-1 col-xl-6" 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('tax-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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -114,13 +115,25 @@
                 @foreach (TaxRecord taxRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@taxRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditTaxRecordModal,@taxRecord.Id)" data-tags='@string.Join(" ", taxRecord.Tags)'>
-                        <td class="col-3 col-xl-1" data-column="date">@taxRecord.Date.ToShortDateString()</td>
-                        <td class="col-4 col-xl-6" data-column="description">@taxRecord.Description</td>
-                        <td class="col-2" data-column="cost" data-record-type="cost">@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(taxRecord.Notes)</td>
+                        <td class="col-3 flex-grow-1 col-xl-1" data-column="date">@taxRecord.Date.ToShortDateString()</td>
+                        <td class="col-4 flex-grow-1 col-xl-6" data-column="description">@taxRecord.Description</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C"))</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(taxRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
-                            <td class="col-2 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(taxRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = taxRecord.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>
                 }
@@ -143,4 +156,8 @@
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'TaxRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'TaxRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
-</ul>
+</ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_UpgradeRecordModal.cshtml

@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage,"Add New Upgrade Record") : translator.Translate(userLanguage,"Edit Upgrade Record"))</h5>
+    <h5 class="modal-title">@(isNew ? translator.Translate(userLanguage, "Add New Upgrade Record") : translator.Translate(userLanguage, "Edit Upgrade Record"))<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditUpgradeRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddUpgradeRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -17,14 +17,22 @@
             <div class="row">
                 <div class="col-md-6 col-12">
                     <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
-                    <label for="upgradeRecordDate">@translator.Translate(userLanguage,"Date")</label>
+                    <label for="upgradeRecordDate">@translator.Translate(userLanguage, "Date")</label>
                     <div class="input-group">
                         <input type="text" id="upgradeRecordDate" class="form-control" placeholder="@translator.Translate(userLanguage,"Date upgrade/mods was installed")" value="@Model.Date">
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
-                    <label for="upgradeRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
-                    <input type="number" inputmode="numeric" id="upgradeRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when upgraded/modded")" value="@(isNew ? "" : Model.Mileage)">
-                    <label for="upgradeRecordDescription">@translator.Translate(userLanguage,"Description")</label>
+                    <label for="upgradeRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
+                    <div class="input-group">
+                        <input type="number" inputmode="numeric" id="upgradeRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when upgraded/modded")" value="@(isNew ? "" : Model.Mileage)">
+                        @if (isNew)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('upgradeRecordMileage')">+</button>
+                            </div>
+                        }
+                    </div>
+                    <label for="upgradeRecordDescription">@translator.Translate(userLanguage, "Description")</label>
                     <input type="text" id="upgradeRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of item(s) upgraded/modded")" value="@Model.Description">
                     @if (isNew)
                     {
@@ -34,13 +42,13 @@
                             </div>
                         </div>
                     }
-                    <label for="upgradeRecordCost">@translator.Translate(userLanguage,"Cost")</label>
+                    <label for="upgradeRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" id="upgradeRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the upgrade/mods")" value="@(isNew ? "" : Model.Cost)">
                     @if (isNew)
                     {
                         @await Html.PartialAsync("_SupplyStore", "UpgradeRecord")
                     }
-                    <label for="upgradeRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
+                    <label for="upgradeRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="upgradeRecordTag">
                         @foreach (string tag in Model.Tags)
                         {
@@ -57,15 +65,15 @@
                     }
                 </div>
                 <div class="col-md-6 col-12">
-                    <label for="upgradeRecordNotes">@translator.Translate(userLanguage,"Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <label for="upgradeRecordNotes">@translator.Translate(userLanguage, "Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea id="upgradeRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
                     @if (Model.Files.Any())
                     {
                         <div>
                             @await Html.PartialAsync("_UploadedFiles", Model.Files)
-                            <label for="upgradeRecordFiles">@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="upgradeRecordFiles">
-                            <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
+                            <label for="upgradeRecordFiles">@translator.Translate(userLanguage, "Upload more documents")</label>
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="upgradeRecordFiles">
+                            <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                         </div>
                     }
                     else
@@ -75,13 +83,15 @@
                             <div class="form-check">
                                 <input class="form-check-input" type="checkbox" value="" id="addReminderCheck">
                                 <label class="form-check-label" for="addReminderCheck">
-                                    @translator.Translate(userLanguage,"Add Reminder")
+                                    @translator.Translate(userLanguage, "Add Reminder")
                                 </label>
                             </div>
                         }
                         <label for="upgradeRecordFiles">Upload documents(optional)</label>
-                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="upgradeRecordFiles">
-                        <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="upgradeRecordFiles">
+                        <br />
+
+                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }
                 </div>
             </div>
@@ -96,39 +106,40 @@
             <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="deleteUpgradeRecord(@Model.Id)">@translator.Translate(userLanguage,"Delete")</button>
+            <button type="button" class="btn btn-md mt-1 mb-1 btn-danger" onclick="deleteUpgradeRecord(@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">
                 <span class="visually-hidden">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu">
-                <li><h6 class="dropdown-header">@translator.Translate(userLanguage,"Move To")</h6></li>
-                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'UpgradeRecord', 'ServiceRecord')">@translator.Translate(userLanguage,"Service Records")</a></li>
-                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'UpgradeRecord', 'RepairRecord')">@translator.Translate(userLanguage,"Repairs")</a></li>
+                <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'UpgradeRecord', 'ServiceRecord')">@translator.Translate(userLanguage, "Service Records")</a></li>
+                <li><a class="dropdown-item" href="#" onclick="moveRecord(@Model.Id, 'UpgradeRecord', 'RepairRecord')">@translator.Translate(userLanguage, "Repairs")</a></li>
             </ul>
         </div>
     }
-    <button type="button" class="btn btn-secondary" onclick="hideAddUpgradeRecordModal()">@translator.Translate(userLanguage,"Cancel")</button>
+    <button type="button" class="btn btn-secondary" onclick="hideAddUpgradeRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
     @if (isNew)
     {
-        <button type="button" class="btn btn-primary" onclick="saveUpgradeRecordToVehicle()">@translator.Translate(userLanguage,"Add New Upgrade Record")</button>
+        <button type="button" class="btn btn-primary" onclick="saveUpgradeRecordToVehicle()">@translator.Translate(userLanguage, "Add New Upgrade Record")</button>
     }
     else if (!isNew)
     {
-        <button type="button" class="btn btn-primary" onclick="saveUpgradeRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Upgrade Record")</button>
+        <button type="button" class="btn btn-primary" onclick="saveUpgradeRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Upgrade Record")</button>
     }
 </div>
 @await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];
-    var recurringReminderRecordId = 0;
+    var recurringReminderRecordId = [];
+    var copySuppliesAttachments = false;
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)
     {
         @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
     }
-        }
+            }
     function getUpgradeRecordModelData() {
         return { id: @Model.Id}
     }

Views/Vehicle/_UpgradeRecords.cshtml

@@ -12,6 +12,7 @@
     {
         extraFields = Model.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct().ToList();
     }
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.UpgradeRecord);
 }
 @model List<UpgradeRecord>
 <div class="row">
@@ -48,31 +49,31 @@
                         <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" data-column-toggle='date' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Date" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'UpgradeRecord')" 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" data-column-toggle='odometer' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Odometer" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='odometer' onChange="showTableColumns(this, 'UpgradeRecord')" 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" data-column-toggle='description' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Description" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'UpgradeRecord')" 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" data-column-toggle='cost' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Cost" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='cost' onChange="showTableColumns(this, 'UpgradeRecord')" 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" data-column-toggle='notes' onChange="showTableColumns(this)" type="checkbox" id="chkCol_Notes" checked>
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'UpgradeRecord')" type="checkbox" id="chkCol_Notes" checked>
                                 <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
                             </div>
                         </li>
@@ -81,7 +82,7 @@
                             var elementId = Guid.NewGuid();
                             <li class="dropdown-item">
                                 <div class="list-group-item">
-                                    <input class="form-check-input" onChange="showTableColumns(this, true)" type="checkbox" id="@elementId">
+                                    <input class="form-check-input col-visible-toggle" data-column-toggle='@extraFieldColumn' onChange="showTableColumns(this, 'UpgradeRecord')" type="checkbox" id="@elementId">
                                     <label class="form-check-label stretched-link" for="@elementId">@extraFieldColumn</label>
                                 </div>
                             </li>
@@ -106,14 +107,14 @@
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-2 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
-                    <th scope="col" class="col-2" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
-                    <th scope="col" class="col-3 col-xl-4" data-column="description">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-2" data-column="cost" onclick="toggleSort('upgrade-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
-                    <th scope="col" class="col-3" data-column="notes">@translator.Translate(userLanguage, "Notes")</th>
+                    <th scope="col" class="col-2 flex-grow-1 col-xl-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 flex-grow-1 col-xl-4" 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('upgrade-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" data-column="@extraFieldColumn">@extraFieldColumn</th>
+                        <th scope="col" style='display:none;' class="col-2 flex-grow-1 flex-shrink-1" data-column="@extraFieldColumn">@extraFieldColumn</th>
                     }
                 </tr>
             </thead>
@@ -121,14 +122,26 @@
                 @foreach (UpgradeRecord upgradeRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@upgradeRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditUpgradeRecordModal,@upgradeRecord.Id)" data-tags='@string.Join(" ", upgradeRecord.Tags)'>
-                        <td class="col-2 col-xl-1" data-column="date">@upgradeRecord.Date.ToShortDateString()</td>
-                        <td class="col-2" data-column="odometer">@upgradeRecord.Mileage</td>
-                        <td class="col-3 col-xl-4" data-column="description">@upgradeRecord.Description</td>
-                        <td class="col-2" data-column="cost" data-record-type="cost">@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes)</td>
+                        <td class="col-2 flex-grow-1 col-xl-1" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(upgradeRecord.Date)">@upgradeRecord.Date.ToShortDateString()</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@upgradeRecord.Mileage</td>
+                        <td class="col-3 flex-grow-1 col-xl-4" data-column="description">@upgradeRecord.Description</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
-                            <td class="col-2 text-truncate" style='display:none;' data-column="@extraFieldColumn">@(upgradeRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "")</td>
+                            <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
+                                @{
+                                    var extraFieldValue = upgradeRecord.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>
                 }
@@ -155,4 +168,12 @@
     <li><hr class="dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'UpgradeRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
-</ul>
+    <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, 'UpgradeRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+</ul>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}