Merge pull request #301 from hargata/Hargata/oidc.auth

Updated app version.

CarCareTracker.csproj

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

Controllers/HomeController.cs

@@ -17,18 +17,26 @@ namespace CarCareTracker.Controllers
         private readonly IUserLogic _userLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IConfigHelper _config;
-
-        public HomeController(ILogger<HomeController> logger, 
+        private readonly IExtraFieldDataAccess _extraFieldDataAccess;
+        private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
+        private readonly IReminderHelper _reminderHelper;
+        public HomeController(ILogger<HomeController> logger,
             IVehicleDataAccess dataAccess,
             IUserLogic userLogic,
             IConfigHelper configuration,
-            IFileHelper fileHelper)
+            IFileHelper fileHelper,
+            IExtraFieldDataAccess extraFieldDataAccess,
+            IReminderRecordDataAccess reminderRecordDataAccess,
+            IReminderHelper reminderHelper)
         {
             _logger = logger;
             _dataAccess = dataAccess;
             _config = configuration;
             _userLogic = userLogic;
             _fileHelper = fileHelper;
+            _extraFieldDataAccess = extraFieldDataAccess;
+            _reminderRecordDataAccess = reminderRecordDataAccess;
+            _reminderHelper = reminderHelper;
         }
         private int GetUserID()
         {
@@ -47,6 +55,35 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_GarageDisplay", vehiclesStored);
         }
+        public IActionResult Calendar()
+        {
+            var vehiclesStored = _dataAccess.GetVehicles();
+            if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
+            }
+            List<ReminderRecordViewModel> reminders = new List<ReminderRecordViewModel>();
+            foreach(Vehicle vehicle in vehiclesStored)
+            {
+                var vehicleReminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
+                vehicleReminders.RemoveAll(x => x.Metric == ReminderMetric.Odometer);
+                //we don't care about mileages so we can basically fake the current vehicle mileage.
+                if (vehicleReminders.Any())
+                {
+                    var maxMileage = vehicleReminders.Max(x => x.Mileage) + 1000;
+                    var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(vehicleReminders, maxMileage, DateTime.Now);
+                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Id = x.Id, Date = x.Date, Urgency = x.Urgency, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate} - {x.Description}" }).ToList();
+                    reminders.AddRange(reminderUrgency);
+                }
+            }
+            return PartialView("_Calendar", reminders);
+        }
+        public IActionResult ViewCalendarReminder(int reminderId)
+        {
+            var reminder = _reminderRecordDataAccess.GetReminderRecordById(reminderId);
+            var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(new List<ReminderRecord> { reminder }, reminder.Mileage + 1000, DateTime.Now).FirstOrDefault();
+            return PartialView("_ReminderRecordCalendarModal", reminderUrgency);
+        }
         public IActionResult Settings()
         {
             var userConfig = _config.GetUserConfig(User);
@@ -68,7 +105,30 @@ namespace CarCareTracker.Controllers
         {
             return View();
         }
-
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        public IActionResult GetExtraFieldsModal(int importMode = 0)
+        {
+            var recordExtraFields = _extraFieldDataAccess.GetExtraFieldsById(importMode);
+            if (recordExtraFields.Id != importMode)
+            {
+                recordExtraFields.Id = importMode;
+            }
+            return PartialView("_ExtraFields", recordExtraFields);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        public IActionResult UpdateExtraFields(RecordExtraField record)
+        {
+            try
+            {
+                var result = _extraFieldDataAccess.SaveExtraFields(record);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+            var recordExtraFields = _extraFieldDataAccess.GetExtraFieldsById(record.Id);
+            return PartialView("_ExtraFields", recordExtraFields);
+        }
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {

Controllers/LoginController.cs

@@ -4,6 +4,8 @@ using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
 using System.Net;
 using System.Security.Cryptography;
 using System.Text;
@@ -15,16 +17,19 @@ namespace CarCareTracker.Controllers
     {
         private IDataProtector _dataProtector;
         private ILoginLogic _loginLogic;
+        private IConfigHelper _config;
         private readonly ILogger<LoginController> _logger;
         public LoginController(
             ILogger<LoginController> logger,
             IDataProtectionProvider securityProvider,
-            ILoginLogic loginLogic
-            ) 
+            ILoginLogic loginLogic,
+            IConfigHelper config
+            )
         {
             _dataProtector = securityProvider.CreateProtector("login");
             _logger = logger;
             _loginLogic = loginLogic;
+            _config = config;
         }
         public IActionResult Index(string redirectURL = "")
         {
@@ -42,6 +47,69 @@ namespace CarCareTracker.Controllers
         {
             return View();
         }
+        public IActionResult GetRemoteLoginLink()
+        {
+            var remoteAuthURL = _config.GetOpenIDConfig().RemoteAuthURL;
+            return Json(remoteAuthURL);
+        }
+        public async Task<IActionResult> RemoteAuth(string code)
+        {
+            try
+            {
+                if (!string.IsNullOrWhiteSpace(code))
+                {
+                    //received code from OIDC provider
+                    //create http client to retrieve user token from OIDC
+                    var httpClient = new HttpClient();
+                    var openIdConfig = _config.GetOpenIDConfig();
+                    var httpParams = new List<KeyValuePair<string, string>>
+                {
+                     new KeyValuePair<string, string>("code", code),
+                     new KeyValuePair<string, string>("grant_type", "authorization_code"),
+                     new KeyValuePair<string, string>("client_id", openIdConfig.ClientId),
+                     new KeyValuePair<string, string>("client_secret", openIdConfig.ClientSecret),
+                     new KeyValuePair<string, string>("redirect_uri", openIdConfig.RedirectURL)
+                };
+                    var httpRequest = new HttpRequestMessage(HttpMethod.Post, openIdConfig.TokenURL)
+                    {
+                        Content = new FormUrlEncodedContent(httpParams)
+                    };
+                    var tokenResult = await httpClient.SendAsync(httpRequest).Result.Content.ReadAsStringAsync();
+                    var userJwt = JsonSerializer.Deserialize<OpenIDResult>(tokenResult)?.id_token ?? string.Empty;
+                    if (!string.IsNullOrWhiteSpace(userJwt))
+                    {
+                        //validate JWT token
+                        var tokenParser = new JwtSecurityTokenHandler();
+                        var parsedToken = tokenParser.ReadJwtToken(userJwt);
+                        var userEmailAddress = parsedToken.Claims.First(x => x.Type == "email").Value;
+                        if (!string.IsNullOrWhiteSpace(userEmailAddress))
+                        {
+                            var userData = _loginLogic.ValidateOpenIDUser(new LoginModel() { EmailAddress = userEmailAddress });
+                            if (userData.Id != default)
+                            {
+                                AuthCookie authCookie = new AuthCookie
+                                {
+                                    UserData = userData,
+                                    ExpiresOn = DateTime.Now.AddDays(1)
+                                };
+                                var serializedCookie = JsonSerializer.Serialize(authCookie);
+                                var encryptedCookie = _dataProtector.Protect(serializedCookie);
+                                Response.Cookies.Append("ACCESS_TOKEN", encryptedCookie, new CookieOptions { Expires = new DateTimeOffset(authCookie.ExpiresOn) });
+                                return new RedirectResult("/Home");
+                            } else
+                            {
+                                _logger.LogInformation($"User {userEmailAddress} tried to login via OpenID but is not a registered user in LubeLogger.");
+                            }
+                        }
+                    }
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new RedirectResult("/Login");
+            }
+            return new RedirectResult("/Login");
+        }
         [HttpPost]
         public IActionResult Login(LoginModel credentials)
         {

Controllers/MigrationController.cs

@@ -52,7 +52,8 @@ namespace CarCareTracker.Controllers
                 "CREATE TABLE IF NOT EXISTS app.userrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, username TEXT not null, emailaddress TEXT not null, password TEXT not null, isadmin BOOLEAN)",
                 "CREATE TABLE IF NOT EXISTS app.tokenrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, body TEXT not null, emailaddress TEXT not null)",
                 "CREATE TABLE IF NOT EXISTS app.userconfigrecords (id INT primary key, data jsonb not null)",
-                "CREATE TABLE IF NOT EXISTS app.useraccessrecords (userId INT, vehicleId INT, PRIMARY KEY(userId, vehicleId))"
+                "CREATE TABLE IF NOT EXISTS app.useraccessrecords (userId INT, vehicleId INT, PRIMARY KEY(userId, vehicleId))",
+                "CREATE TABLE IF NOT EXISTS app.extrafields (id INT primary key, data jsonb not null)"
             };
             foreach(string cmd in cmds)
             {
@@ -97,6 +98,8 @@ namespace CarCareTracker.Controllers
                 var tokenrecords = new List<Token>();
                 var userconfigrecords = new List<UserConfigData>();
                 var useraccessrecords = new List<UserAccess>();
+
+                var extrafields = new List<RecordExtraField>();
                 #region "Part1"
                 string cmd = $"SELECT data FROM app.vehicles";
                 using (var ctext = pgDataSource.CreateCommand(cmd))
@@ -396,6 +399,25 @@ namespace CarCareTracker.Controllers
                     };
                 }
                 #endregion
+                #region "Part5"
+                cmd = $"SELECT data FROM app.extrafields";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            extrafields.Add(System.Text.Json.JsonSerializer.Deserialize<RecordExtraField>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in extrafields)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<RecordExtraField>("extrafields");
+                        table.Upsert(record);
+                    };
+                }
+                #endregion
                 var destFilePath = $"{fullFolderPath}.zip";
                 ZipFile.CreateFromDirectory(fullFolderPath, destFilePath);
                 return Json(new OperationResponse { Success = true, Message = $"/{tempFolder}.zip" });
@@ -441,6 +463,8 @@ namespace CarCareTracker.Controllers
                 var tokenrecords = new List<Token>();
                 var userconfigrecords = new List<UserConfigData>();
                 var useraccessrecords = new List<UserAccess>();
+
+                var extrafields = new List<RecordExtraField>();
                 #region "Part1"
                 using (var db = new LiteDatabase(fullFileName))
                 {
@@ -704,6 +728,23 @@ namespace CarCareTracker.Controllers
                     }
                 }
                 #endregion
+                #region "Part5"
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<RecordExtraField>("extrafields");
+                    extrafields = table.FindAll().ToList();
+                };
+                foreach (var record in extrafields)
+                {
+                    string cmd = $"INSERT INTO app.extrafields (id, data) VALUES(@id, CAST(@data AS jsonb))";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                #endregion
                 return Json(new OperationResponse { Success = true, Message = "Data Imported Successfully" });
             }
             catch (Exception ex)

Controllers/VehicleController.cs

@@ -36,6 +36,7 @@ namespace CarCareTracker.Controllers
         private readonly IReminderHelper _reminderHelper;
         private readonly IReportHelper _reportHelper;
         private readonly IUserLogic _userLogic;
+        private readonly IExtraFieldDataAccess _extraFieldDataAccess;
 
         public VehicleController(ILogger<VehicleController> logger,
             IFileHelper fileHelper,
@@ -54,6 +55,7 @@ namespace CarCareTracker.Controllers
             IPlanRecordDataAccess planRecordDataAccess,
             IPlanRecordTemplateDataAccess planRecordTemplateDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
+            IExtraFieldDataAccess extraFieldDataAccess,
             IUserLogic userLogic,
             IWebHostEnvironment webEnv,
             IConfigHelper config)
@@ -75,6 +77,7 @@ namespace CarCareTracker.Controllers
             _planRecordDataAccess = planRecordDataAccess;
             _planRecordTemplateDataAccess = planRecordTemplateDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
+            _extraFieldDataAccess = extraFieldDataAccess;
             _userLogic = userLogic;
             _webEnv = webEnv;
             _config = config;
@@ -256,7 +259,8 @@ namespace CarCareTracker.Controllers
                         PartNumber = x.PartNumber,
                         PartQuantity = x.Quantity.ToString(),
                         PartSupplier = x.PartSupplier,
-                        Notes = x.Notes
+                        Notes = x.Notes,
+                        Tags = string.Join(" ", x.Tags)
                     });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
@@ -508,7 +512,8 @@ namespace CarCareTracker.Controllers
                                         Quantity = decimal.Parse(importModel.PartQuantity, NumberStyles.Any),
                                         Description = importModel.Description,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
-                                        Notes = importModel.Notes
+                                        Notes = importModel.Notes,
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
                                     };
                                     _supplyRecordDataAccess.SaveSupplyRecordToVehicle(convertedRecord);
                                 }
@@ -587,7 +592,7 @@ namespace CarCareTracker.Controllers
             var vehicleData = _dataAccess.GetVehicleById(vehicleId);
             var vehicleIsElectric = vehicleData.IsElectric;
             var vehicleUseHours = vehicleData.UseHours;
-            return PartialView("_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() });
+            return PartialView("_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields } });
         }
         [HttpGet]
         public IActionResult GetGasRecordForEditById(int gasRecordId)
@@ -605,7 +610,8 @@ namespace CarCareTracker.Controllers
                 IsFillToFull = result.IsFillToFull,
                 MissedFuelUp = result.MissedFuelUp,
                 Notes = result.Notes,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields)
             };
             var vehicleData = _dataAccess.GetVehicleById(convertedResult.VehicleId);
             var vehicleIsElectric = vehicleData.IsElectric;
@@ -676,7 +682,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddServiceRecordPartialView()
         {
-            return PartialView("_ServiceRecordModal", new ServiceRecordInput());
+            return PartialView("_ServiceRecordModal", new ServiceRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetServiceRecordForEditById(int serviceRecordId)
@@ -693,7 +699,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields)
             };
             return PartialView("_ServiceRecordModal", convertedResult);
         }
@@ -746,7 +753,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddCollisionRecordPartialView()
         {
-            return PartialView("_CollisionRecordModal", new CollisionRecordInput());
+            return PartialView("_CollisionRecordModal", new CollisionRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetCollisionRecordForEditById(int collisionRecordId)
@@ -763,7 +770,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields)
             };
             return PartialView("_CollisionRecordModal", convertedResult);
         }
@@ -820,7 +828,8 @@ namespace CarCareTracker.Controllers
                             RecurringInterval = recurringFee.RecurringInterval,
                             CustomMonthInterval = recurringFee.CustomMonthInterval,
                             Files = recurringFee.Files,
-                            Tags = recurringFee.Tags
+                            Tags = recurringFee.Tags,
+                            ExtraFields = recurringFee.ExtraFields
                         };
                         _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
                         _taxRecordDataAccess.SaveTaxRecordToVehicle(newRecurringFee);
@@ -839,7 +848,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddTaxRecordPartialView()
         {
-            return PartialView("_TaxRecordModal", new TaxRecordInput());
+            return PartialView("_TaxRecordModal", new TaxRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetTaxRecordForEditById(int taxRecordId)
@@ -858,7 +867,8 @@ namespace CarCareTracker.Controllers
                 RecurringInterval = result.RecurringInterval,
                 CustomMonthInterval = result.CustomMonthInterval,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields)
             };
             return PartialView("_TaxRecordModal", convertedResult);
         }
@@ -1415,7 +1425,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddUpgradeRecordPartialView()
         {
-            return PartialView("_UpgradeRecordModal", new UpgradeRecordInput());
+            return PartialView("_UpgradeRecordModal", new UpgradeRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetUpgradeRecordForEditById(int upgradeRecordId)
@@ -1432,7 +1442,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields)
             };
             return PartialView("_UpgradeRecordModal", convertedResult);
         }
@@ -1493,7 +1504,11 @@ namespace CarCareTracker.Controllers
             {
                 //get supply record.
                 var supplyData = _supplyRecordDataAccess.GetSupplyRecordById(supply.SupplyId);
-                if (supply.Quantity > supplyData.Quantity)
+                if (supplyData == null)
+                {
+                    result.Add("Missing Supplies, Please Delete This Template and Recreate It.");
+                }
+                else if (supply.Quantity > supplyData.Quantity)
                 {
                     result.Add($"Insufficient Quantity for {supplyData.Description}, need: {supply.Quantity}, available: {supplyData.Quantity}");
                 }
@@ -1563,7 +1578,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddSupplyRecordPartialView()
         {
-            return PartialView("_SupplyRecordModal", new SupplyRecordInput());
+            return PartialView("_SupplyRecordModal", new SupplyRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
@@ -1581,7 +1596,9 @@ namespace CarCareTracker.Controllers
                 PartSupplier = result.PartSupplier,
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
-                Files = result.Files
+                Files = result.Files,
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields)
             };
             return PartialView("_SupplyRecordModal", convertedResult);
         }
@@ -1675,7 +1692,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddPlanRecordPartialView()
         {
-            return PartialView("_PlanRecordModal", new PlanRecordInput());
+            return PartialView("_PlanRecordModal", new PlanRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields });
         }
         [HttpPost]
         public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
@@ -1693,7 +1710,8 @@ namespace CarCareTracker.Controllers
                         Date = DateTime.Now,
                         VehicleId = existingRecord.VehicleId,
                         Mileage = odometer,
-                        Notes = $"Auto Insert From Plan Record: {existingRecord.Description}"
+                        Notes = $"Auto Insert From Plan Record: {existingRecord.Description}",
+                        ExtraFields = existingRecord.ExtraFields
                     });
                 }
                 //convert plan record to service/upgrade/repair record.
@@ -1707,7 +1725,8 @@ namespace CarCareTracker.Controllers
                         Description = existingRecord.Description,
                         Cost = existingRecord.Cost,
                         Notes = existingRecord.Notes,
-                        Files = existingRecord.Files
+                        Files = existingRecord.Files,
+                        ExtraFields = existingRecord.ExtraFields
                     };
                     _serviceRecordDataAccess.SaveServiceRecordToVehicle(newRecord);
                 }
@@ -1721,7 +1740,8 @@ namespace CarCareTracker.Controllers
                         Description = existingRecord.Description,
                         Cost = existingRecord.Cost,
                         Notes = existingRecord.Notes,
-                        Files = existingRecord.Files
+                        Files = existingRecord.Files,
+                        ExtraFields = existingRecord.ExtraFields
                     };
                     _collisionRecordDataAccess.SaveCollisionRecordToVehicle(newRecord);
                 }
@@ -1735,7 +1755,8 @@ namespace CarCareTracker.Controllers
                         Description = existingRecord.Description,
                         Cost = existingRecord.Cost,
                         Notes = existingRecord.Notes,
-                        Files = existingRecord.Files
+                        Files = existingRecord.Files,
+                        ExtraFields = existingRecord.ExtraFields
                     };
                     _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(newRecord);
                 }
@@ -1759,7 +1780,8 @@ namespace CarCareTracker.Controllers
                 Cost = result.Cost,
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
-                Files = result.Files
+                Files = result.Files,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields)
             };
             return PartialView("_PlanRecordModal", convertedResult);
         }
@@ -1798,7 +1820,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddOdometerRecordPartialView()
         {
-            return PartialView("_OdometerRecordModal", new OdometerRecordInput());
+            return PartialView("_OdometerRecordModal", new OdometerRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetOdometerRecordForEditById(int odometerRecordId)
@@ -1813,7 +1835,8 @@ namespace CarCareTracker.Controllers
                 Notes = result.Notes,
                 VehicleId = result.VehicleId,
                 Files = result.Files,
-                Tags = result.Tags
+                Tags = result.Tags,
+                ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields)
             };
             return PartialView("_OdometerRecordModal", convertedResult);
         }

External/Implementations/Litedb/ExtraFieldDataAccess.cs

@@ -0,0 +1,30 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class ExtraFieldDataAccess: IExtraFieldDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "extrafields";
+        public RecordExtraField GetExtraFieldsById(int importMode)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                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;
+            };
+        }
+    }
+}

External/Implementations/Postgres/ExtraFieldDataAccess.cs

@@ -0,0 +1,76 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGExtraFieldDataAccess : IExtraFieldDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGExtraFieldDataAccess> _logger;
+        private static string tableName = "extrafields";
+        public PGExtraFieldDataAccess(IConfiguration config, ILogger<PGExtraFieldDataAccess> logger)
+        {
+            pgDataSource = NpgsqlDataSource.Create(config["POSTGRES_CONNECTION"]);
+
+            _logger = logger;
+            try
+            {
+                //create table if not exist.
+                string initCMD = $"CREATE TABLE IF NOT EXISTS app.{tableName} (id INT primary key, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public RecordExtraField GetExtraFieldsById(int importMode)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var results = new RecordExtraField();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", importMode);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            RecordExtraField result = JsonSerializer.Deserialize<RecordExtraField>(reader["data"] as string);
+                            results = result;
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new RecordExtraField();
+            }
+        }
+        public bool SaveExtraFields(RecordExtraField record)
+        {
+            try
+            {
+                var existingRecord = GetExtraFieldsById(record.Id);
+                string cmd = $"INSERT INTO app.{tableName} (id, data) VALUES(@id, CAST(@data AS jsonb)) ON CONFLICT(id) DO UPDATE SET data = CAST(@data AS jsonb)";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", record.Id);
+                    ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Interfaces/IExtraFieldDataAccess.cs

@@ -0,0 +1,10 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IExtraFieldDataAccess
+    {
+        public RecordExtraField GetExtraFieldsById(int importMode);
+        public bool SaveExtraFields(RecordExtraField record);
+    }
+}

Helper/ConfigHelper.cs

@@ -7,6 +7,7 @@ namespace CarCareTracker.Helper
 {
     public interface IConfigHelper
     {
+        OpenIDConfig GetOpenIDConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         string GetLogoUrl();
@@ -28,6 +29,11 @@ namespace CarCareTracker.Helper
             _userConfig = userConfig;
             _cache = memoryCache;
         }
+        public OpenIDConfig GetOpenIDConfig()
+        {
+            OpenIDConfig openIdConfig = _config.GetSection("OpenIDConfig").Get<OpenIDConfig>() ?? new OpenIDConfig();
+            return openIdConfig;
+        }
         public string GetLogoUrl()
         {
             var logoUrl = _config["LUBELOGGER_LOGO_URL"];

Helper/StaticHelper.cs

@@ -1,5 +1,6 @@
 using CarCareTracker.Models;
 using System.Globalization;
+using System.Linq;
 
 namespace CarCareTracker.Helper
 {
@@ -128,7 +129,8 @@ namespace CarCareTracker.Helper
                 Mileage = input.Mileage,
                 Files = input.Files,
                 Notes = input.Notes,
-                Tags = input.Tags
+                Tags = input.Tags,
+                ExtraFields = input.ExtraFields
             };
         }
         public static CollisionRecord GenericToRepairRecord(GenericRecord input)
@@ -142,7 +144,8 @@ namespace CarCareTracker.Helper
                 Mileage = input.Mileage,
                 Files = input.Files,
                 Notes = input.Notes,
-                Tags = input.Tags
+                Tags = input.Tags,
+                ExtraFields = input.ExtraFields
             };
         }
         public static UpgradeRecord GenericToUpgradeRecord(GenericRecord input)
@@ -156,10 +159,35 @@ namespace CarCareTracker.Helper
                 Mileage = input.Mileage,
                 Files = input.Files,
                 Notes = input.Notes,
-                Tags = input.Tags
+                Tags = input.Tags,
+                ExtraFields = input.ExtraFields
             };
         }
 
+        public static List<ExtraField> AddExtraFields(List<ExtraField> recordExtraFields, List<ExtraField> templateExtraFields)
+        {
+            if (!templateExtraFields.Any()) {
+                return new List<ExtraField>();
+            }
+            if (!recordExtraFields.Any())
+            {
+                return templateExtraFields;
+            }
+            var fieldNames = templateExtraFields.Select(x => x.Name);
+            //remove fields that are no longer present in template.
+            recordExtraFields.RemoveAll(x => !fieldNames.Contains(x.Name));
+            if (!recordExtraFields.Any())
+            {
+                return templateExtraFields;
+            }
+            //append the fields.
+            foreach (ExtraField extraField in recordExtraFields)
+            {
+                extraField.IsRequired = templateExtraFields.Where(x => x.Name == extraField.Name).First().IsRequired;
+            }
+            return recordExtraFields;
+        }
+
         public static string GetFuelEconomyUnit(bool useKwh, bool useHours, bool useMPG, bool useUKMPG)
         {
             string fuelEconomyUnit;
@@ -182,5 +210,9 @@ namespace CarCareTracker.Helper
             }
             return fuelEconomyUnit;
         }
+        public static long GetEpochFromDateTime(DateTime date)
+        {
+            return new DateTimeOffset(date).ToUnixTimeMilliseconds();
+        }
     }
 }

Logic/LoginLogic.cs

@@ -21,6 +21,7 @@ namespace CarCareTracker.Logic
         OperationResponse ResetPasswordByUser(LoginModel credentials);
         OperationResponse ResetUserPassword(LoginModel credentials);
         UserData ValidateUserCredentials(LoginModel credentials);
+        UserData ValidateOpenIDUser(LoginModel credentials);
         bool CheckIfUserIsValid(int userId);
         bool CreateRootUserCredentials(LoginModel credentials);
         bool DeleteRootUserCredentials();
@@ -193,6 +194,19 @@ namespace CarCareTracker.Logic
                 }
             }
         }
+        public UserData ValidateOpenIDUser(LoginModel credentials)
+        {
+            var result = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (result.Id != default)
+            {
+                result.Password = string.Empty;
+                return result;
+            }
+            else
+            {
+                return new UserData();
+            }
+        }
         #region "Admin Functions"
         public bool MakeUserAdmin(int userId, bool isAdmin)
         {
@@ -280,19 +294,32 @@ namespace CarCareTracker.Logic
         #region "Root User"
         public bool CreateRootUserCredentials(LoginModel credentials)
         {
-            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
-            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-            if (existingUserConfig is not null)
+            //check if file exists
+            if (File.Exists(StaticHelper.UserConfigPath))
             {
-                //create hashes of the login credentials.
-                var hashedUserName = GetHash(credentials.UserName);
-                var hashedPassword = GetHash(credentials.Password);
-                //copy over settings that are off limits on the settings page.
-                existingUserConfig.EnableAuth = true;
-                existingUserConfig.UserNameHash = hashedUserName;
-                existingUserConfig.UserPasswordHash = hashedPassword;
+                var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+                var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+                if (existingUserConfig is not null)
+                {
+                    //create hashes of the login credentials.
+                    var hashedUserName = GetHash(credentials.UserName);
+                    var hashedPassword = GetHash(credentials.Password);
+                    //copy over settings that are off limits on the settings page.
+                    existingUserConfig.EnableAuth = true;
+                    existingUserConfig.UserNameHash = hashedUserName;
+                    existingUserConfig.UserPasswordHash = hashedPassword;
+                }
+                File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
+            } else
+            {
+                var newUserConfig = new UserConfig()
+                {
+                    EnableAuth = true,
+                    UserNameHash = GetHash(credentials.UserName),
+                    UserPasswordHash = GetHash(credentials.Password)
+                };
+                File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(newUserConfig));
             }
-            File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
             _cache.Remove("userConfig_-1");
             return true;
         }

Models/Collision/CollisionRecordInput.cs

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

Models/ExtraField.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public class ExtraField
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+        public bool IsRequired { get; set; }
+    }
+}

Models/GasRecord/GasRecord.cs

@@ -19,5 +19,6 @@
         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>();
     }
 }

Models/GasRecord/GasRecordInput.cs

@@ -19,6 +19,7 @@
         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 GasRecord ToGasRecord() { return new GasRecord { 
             Id = Id, 
             Cost = Cost, 
@@ -30,7 +31,8 @@
             IsFillToFull = IsFillToFull,
             MissedFuelUp = MissedFuelUp,
             Notes = Notes,
-            Tags = Tags
+            Tags = Tags,
+            ExtraFields = ExtraFields
         }; }
     }
 }

Models/GenericRecord.cs

@@ -11,5 +11,6 @@
         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>();
     }
 }

Models/ImportModel.cs

@@ -35,6 +35,7 @@
         public string Description { get; set; }
         public string Cost { get; set; }
         public string Notes { get; set; }
+        public string Tags { get; set; }
     }
 
     public class ServiceRecordExportModel

Models/OIDC/OpenIDConfig.cs

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

Models/OIDC/OpenIDResult.cs

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

Models/OdometerRecord/OdometerRecord.cs

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

Models/OdometerRecord/OdometerRecordInput.cs

@@ -9,6 +9,7 @@
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
-        public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files, Tags = Tags }; }
+        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 }; }
     }
 }

Models/PlanRecord/PlanRecord.cs

@@ -13,5 +13,6 @@
         public PlanPriority Priority { get; set; }
         public PlanProgress Progress { get; set; }
         public decimal Cost { get; set; }
+        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
     }
 }

Models/PlanRecord/PlanRecordInput.cs

@@ -14,6 +14,7 @@
         public PlanPriority Priority { get; set; }
         public PlanProgress Progress { get; set; }
         public decimal Cost { get; set; }
+        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public PlanRecord ToPlanRecord() { return new PlanRecord { 
             Id = Id, 
             VehicleId = VehicleId, 
@@ -25,7 +26,8 @@
             ImportMode = ImportMode,
             Cost = Cost,
             Priority = Priority,
-            Progress = Progress
+            Progress = Progress,
+            ExtraFields = ExtraFields
         }; }
     }
 }

Models/RecordExtraField.cs

@@ -0,0 +1,14 @@
+using LiteDB;
+
+namespace CarCareTracker.Models
+{
+    public class RecordExtraField
+    {
+        /// <summary>
+        /// Corresponds to int value of ImportMode enum
+        /// </summary>
+        [BsonId(false)]
+        public int Id { get; set; }
+        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+    }
+}

Models/ServiceRecord/ServiceRecordInput.cs

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

Models/Supply/SupplyRecord.cs

@@ -33,5 +33,7 @@
         /// </summary>
         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>();
     }
 }

Models/Supply/SupplyRecordInput.cs

@@ -12,6 +12,8 @@
         public decimal Cost { 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 SupplyRecord ToSupplyRecord() { return new SupplyRecord { 
             Id = Id, 
             VehicleId = VehicleId, 
@@ -22,6 +24,9 @@
             Quantity = Quantity,
             Description = Description, 
             Notes = Notes, 
-            Files = Files }; }
+            Files = Files,
+            Tags = Tags,
+            ExtraFields = ExtraFields
+        }; }
     }
 }

Models/TaxRecord/TaxRecord.cs

@@ -13,5 +13,6 @@
         public int CustomMonthInterval { get; set; } = 0;
         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>();
     }
 }

Models/TaxRecord/TaxRecordInput.cs

@@ -13,6 +13,7 @@
         public int CustomMonthInterval { get; set; } = 0;
         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 TaxRecord ToTaxRecord() { return new TaxRecord { 
             Id = Id, 
             VehicleId = VehicleId, 
@@ -24,7 +25,8 @@
             RecurringInterval = RecurringInterval,
             CustomMonthInterval = CustomMonthInterval,
             Files = Files,
-            Tags = Tags
+            Tags = Tags,
+            ExtraFields = ExtraFields
         }; }
     }
 }

Models/UpgradeRecord/UpgradeReportInput.cs

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

Program.cs

@@ -31,6 +31,7 @@ if (!string.IsNullOrWhiteSpace(builder.Configuration["POSTGRES_CONNECTION"])){
     builder.Services.AddSingleton<IUserRecordDataAccess, PGUserRecordDataAccess>();
     builder.Services.AddSingleton<ITokenRecordDataAccess, PGTokenRecordDataAccess>();
     builder.Services.AddSingleton<IUserAccessDataAccess, PGUserAccessDataAccess>();
+    builder.Services.AddSingleton<IExtraFieldDataAccess, PGExtraFieldDataAccess>();
 }
 else
 {
@@ -50,6 +51,7 @@ else
     builder.Services.AddSingleton<IUserRecordDataAccess, UserRecordDataAccess>();
     builder.Services.AddSingleton<ITokenRecordDataAccess, TokenRecordDataAccess>();
     builder.Services.AddSingleton<IUserAccessDataAccess, UserAccessDataAccess>();
+    builder.Services.AddSingleton<IExtraFieldDataAccess, ExtraFieldDataAccess>();
 }
 
 //configure helpers

Views/Home/Index.cshtml

@@ -27,6 +27,9 @@
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
             </li>
         }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</button>
+        </li>
         <li class="nav-item" role="presentation">
             <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>@translator.Translate(userLanguage,"Settings")</span></button>
         </li>
@@ -64,6 +67,9 @@
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
             </li>
         }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</button>
+        </li>
         <li class="nav-item ms-auto" role="presentation">
             <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><i class="bi bi-gear me-2"></i>@translator.Translate(userLanguage,"Settings")</button>
         </li>
@@ -93,6 +99,8 @@
         </div>
         <div class="tab-pane fade" id="supply-tab-pane" role="tabpanel" tabindex="0">
         </div>
+        <div class="tab-pane fade" id="calendar-tab-pane" role="tabpanel" tabindex="0">
+        </div>
         <div class="tab-pane fade @(Model == "settings" ? "show active" : "")" id="settings-tab-pane" role="tabpanel" tabindex="0">
         </div>
     </div>

Views/Home/_Calendar.cshtml

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

Views/Home/_ExtraFields.cshtml

@@ -0,0 +1,124 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@model RecordExtraField
+<script>
+    var extraFields = [];
+</script>
+<div class="modal-header">
+    <h5 class="modal-title">@(translator.Translate(userLanguage, "Manage Extra Fields"))</h5>
+    <button type="button" class="btn-close" onclick="hideExtraFieldModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-12">
+                    <select class="form-select" onchange="refreshExtraFieldModal()" id="extraFieldTab">
+                        <!option @(Model.Id == (int)ImportMode.ServiceRecord ? "selected" : "") value="@((int)ImportMode.ServiceRecord)">@translator.Translate(userLanguage, "Service Record")</!option>
+                        <!option @(Model.Id == (int)ImportMode.RepairRecord ? "selected" : "") value="@((int)ImportMode.RepairRecord)">@translator.Translate(userLanguage, "Repairs")</!option>
+                        <!option @(Model.Id == (int)ImportMode.UpgradeRecord ? "selected" : "") value="@((int)ImportMode.UpgradeRecord)">@translator.Translate(userLanguage, "Upgrades")</!option>
+                        <!option @(Model.Id == (int)ImportMode.GasRecord ? "selected" : "") value="@((int)ImportMode.GasRecord)">@translator.Translate(userLanguage, "Fuel")</!option>
+                        <!option @(Model.Id == (int)ImportMode.TaxRecord ? "selected" : "") value="@((int)ImportMode.TaxRecord)">@translator.Translate(userLanguage, "Tax")</!option>
+                        <!option @(Model.Id == (int)ImportMode.SupplyRecord ? "selected" : "") value="@((int)ImportMode.SupplyRecord)">@translator.Translate(userLanguage, "Supplies")</!option>
+                        <!option @(Model.Id == (int)ImportMode.PlanRecord ? "selected" : "") value="@((int)ImportMode.PlanRecord)">@translator.Translate(userLanguage, "Planner")</!option>
+                        <!option @(Model.Id == (int)ImportMode.OdometerRecord ? "selected" : "") value="@((int)ImportMode.OdometerRecord)">@translator.Translate(userLanguage, "Odometer")</!option>
+                    </select>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-12">
+                    <table class="table table-hover">
+                        <thead class="sticky-top">
+                            <tr class="d-flex">
+                                <th scope="col" class="col-8">@translator.Translate(userLanguage, "Name")</th>
+                                <th scope="col" class="col-2">@translator.Translate(userLanguage, "Required")</th>
+                                <th scope="col" class="col-2">@translator.Translate(userLanguage, "Delete")</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @if (Model.ExtraFields != null)
+                            {
+                                @foreach (ExtraField extraField in Model.ExtraFields)
+                                {
+                                    <script>
+                                        extraFields.push({ name: decodeHTMLEntities('@extraField.Name'), isRequired: @extraField.IsRequired.ToString().ToLower()});
+                                    </script>
+                                    <tr class="d-flex">
+                                        <td class="col-8">@extraField.Name</td>
+                                        <td class="col-2"><input class="form-check-input" type="checkbox" onchange="updateExtraFieldIsRequired(decodeHTMLEntities('@extraField.Name'), this)" value="" @(extraField.IsRequired ? "checked" : "") /></td>
+                                        <td class="col-2"><button type="button" onclick="deleteExtraField(decodeHTMLEntities('@extraField.Name'))" class="btn btn-danger"><i class="bi bi-trash"></i></button></td>
+                                    </tr>
+                                }
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideExtraFieldModal()">@translator.Translate(userLanguage, "Close")</button>
+    <button type="button" class="btn btn-primary" onclick="addExtraField()">@translator.Translate(userLanguage, "Add New Field")</button>
+</div>
+<script>
+    var importMode = @Model.Id;
+    function addExtraField() {
+        Swal.fire({
+            title: 'Field Name',
+            html: `
+                                <input type="text" id="inputExtraFieldName" class="swal2-input" placeholder="Field Name">
+                                `,
+            confirmButtonText: 'Add',
+            focusConfirm: false,
+            preConfirm: () => {
+                const extraFieldName = $("#inputExtraFieldName").val();
+                if (!extraFieldName || extraFieldName.trim() == '') {
+                    Swal.showValidationMessage(`Field names cannot be blank`);
+                } else if (extraFields.filter(x => x.name == extraFieldName).length > 0) {
+                    Swal.showValidationMessage(`Field names must be unique`);
+                }
+                return { extraFieldName }
+            },
+        }).then(function (result) {
+            if (result.isConfirmed) {
+                extraFields.push({ name: result.value.extraFieldName, isRequired: false});
+                updateExtraFields();
+            }
+        });
+    }
+    function updateExtraFieldIsRequired(fieldId, checkbox){
+        var indexToEdit = extraFields.findIndex(x => x.name == fieldId);
+        var extraFieldToEdit = extraFields[indexToEdit];
+        extraFieldToEdit.isRequired = $(checkbox).is(":checked");
+        updateExtraFields();
+    }
+    function deleteExtraField(fieldId) {
+        extraFields = extraFields.filter(x => x.name != fieldId);
+        updateExtraFields();
+    }
+    function refreshExtraFieldModal() {
+        var selectedExtraFieldTab = $("#extraFieldTab").val();
+        $.post(`/Home/GetExtraFieldsModal?importMode=${selectedExtraFieldTab}`, function (data) {
+            if (data) {
+                $("#extraFieldModalContent").html(data);
+            } else {
+                errorToast(genericErrorMessage());
+            }
+        });
+    }
+    function updateExtraFields() {
+        $.post('/Home/UpdateExtraFields', { id: importMode, extraFields: extraFields }, function (data) {
+            if (data) {
+                $("#extraFieldModalContent").html(data);
+            } else {
+                errorToast(genericErrorMessage());
+            }
+        });
+    }
+</script>

Views/Home/_ReminderRecordCalendarModal.cshtml

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

Views/Home/_Settings.cshtml

@@ -178,6 +178,16 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-12 col-md-6">
+                    <span class="lead">@translator.Translate(userLanguage, "Manage Extra Fields")</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>
+                    </div>
+                </div>
+            </div>
         }
     </div>
 </div>
@@ -191,7 +201,7 @@
             <img src="/defaults/lubelogger_logo.png" />
         </div>
         <div class="d-flex justify-content-center">
-            <small class="text-body-secondary">Version 1.1.5</small>
+            <small class="text-body-secondary">Version 1.1.9</small>
         </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.
@@ -229,7 +239,22 @@
         </ul>
     </div>
 </div>
+<div class="modal fade" data-bs-focus="false" id="extraFieldModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="extraFieldModalContent">
+        </div>
+    </div>
+</div>
 <script>
+    function showExtraFieldModal() {
+        $.get(`/Home/GetExtraFieldsModal?importMode=0`, function (data) {
+            $("#extraFieldModalContent").html(data);
+            $("#extraFieldModal").modal('show');
+        });
+    }
+    function hideExtraFieldModal() {
+        $("#extraFieldModal").modal('hide');
+    }
     function getCheckedTabs() {
         var visibleTabs = $("#visibleTabs :checked").map(function () {
             return this.value;
@@ -283,13 +308,13 @@
             window.location.href = data;
         });
     }
-    function openUploadLanguage(){
+    function openUploadLanguage() {
         $("#inputLanguage").click();
     }
     function openRestoreBackup() {
         $("#inputBackup").click();
     }
-    function uploadLanguage(event){
+    function uploadLanguage(event) {
         let formData = new FormData();
         formData.append("file", event.files[0]);
         sloader.show();
@@ -308,7 +333,7 @@
                     errorToast(response.message);
                 }
             },
-            error: function(){
+            error: function () {
                 sloader.hide();
                 errorToast("An error has occurred, please check the file size and try again later.");
             }
@@ -351,9 +376,9 @@
             Swal.fire({
                 title: 'Setup Credentials',
                 html: `
-                        <input type="text" id="authUsername" class="swal2-input" placeholder="Username">
-                        <input type="password" id="authPassword" class="swal2-input" placeholder="Password">
-                        `,
+                                    <input type="text" id="authUsername" class="swal2-input" placeholder="Username">
+                                    <input type="password" id="authPassword" class="swal2-input" placeholder="Password">
+                                    `,
                 confirmButtonText: 'Setup',
                 focusConfirm: false,
                 preConfirm: () => {

Views/Login/Index.cshtml

@@ -5,6 +5,7 @@
 @{
     var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
+    var openIdConfigName = config.GetOpenIDConfig().Name;
 }
 @{
     ViewData["Title"] = "LubeLogger - Login";
@@ -31,6 +32,12 @@
             <div class="d-grid">
                 <button type="button" class="btn btn-warning mt-2" onclick="performLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Login")</button>
             </div>
+            @if (!string.IsNullOrWhiteSpace(openIdConfigName))
+            {
+                <div class="d-grid">
+                    <button type="button" class="btn btn-secondary mt-2" onclick="remoteLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>@($"{translator.Translate(userLanguage, "Login via")} {openIdConfigName}")</button>
+                </div>
+            }
             <div class="d-grid">
                 <a href="/Login/ForgotPassword" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Forgot Password")</a>
             </div>
@@ -41,7 +48,7 @@
     </div>
 </div>
 <script>
-    function getRedirectURL(){
+    function getRedirectURL() {
         return { url: decodeHTMLEntities('@Model') };
     }
 </script>

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -23,11 +23,11 @@
                         <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" id="collisionRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when repaired")" value="@(isNew ? "" : Model.Mileage)">
+                    <input type="number" inputmode="numeric" id="collisionRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when repaired")" value="@(isNew ? "" : Model.Mileage)">
                     <label for="collisionRecordDescription">@translator.Translate(userLanguage,"Description")</label>
                     <input type="text" id="collisionRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of item(s) repaired(i.e. Alternator)")" value="@Model.Description">
                     <label for="collisionRecordCost">@translator.Translate(userLanguage,"Cost")</label>
-                    <input type="text" id="collisionRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the repair")" value="@(isNew ? "" : Model.Cost)">
+                    <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")
@@ -39,6 +39,14 @@
                             <!option value="@tag">@tag</!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="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>

Views/Vehicle/_GasModal.cshtml

@@ -52,9 +52,9 @@
                         <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" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when refueled")" value="@(isNew ? "" : Model.GasRecord.Mileage)">
+                    <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when refueled")" value="@(isNew ? "" : Model.GasRecord.Mileage)">
                     <label for="gasRecordGallons">@($"{translator.Translate(userLanguage, "Fuel Consumption")}({consumptionUnit})")</label>
-                    <input type="text" id="gasRecordGallons" class="form-control" placeholder="@translator.Translate(userLanguage,"Amount of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Gallons)">
+                    <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">
                         <input class="form-check-input" type="checkbox" role="switch" id="gasIsFillToFull" checked="@Model.GasRecord.IsFillToFull">
                         <label class="form-check-label" for="gasIsFillToFull">@translator.Translate(userLanguage,"Is Filled To Full")</label>
@@ -67,7 +67,7 @@
                     @if (isNew)
                     {
                         <div class="input-group">
-                            <input type="text" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                            <input type="text" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
                             <div class="input-group-text">
                                 <select class="form-select form-select-sm" id="gasCostType">
                                     <option value="total">@translator.Translate(userLanguage,"Total")</option>
@@ -77,7 +77,7 @@
                         </div>
                     } else
                     {
-                        <input type="text" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                        <input type="text" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
                     }
                     <label for="gasRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="gasRecordTag">
@@ -86,6 +86,14 @@
                             <!option value="@tag">@tag</!option>
                         }
                     </select>
+                    @foreach (ExtraField field in Model.GasRecord.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="gasRecordNotes">@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/_OdometerRecordModal.cshtml

@@ -23,7 +23,7 @@
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
                     <label for="odometerRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
-                    <input type="number" id="odometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading")" value="@(isNew ? "" : Model.Mileage)">
+                    <input type="number" inputmode="numeric" id="odometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading")" value="@(isNew ? "" : Model.Mileage)">
                     <label for="odometerRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="odometerRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -31,6 +31,14 @@
                             <!option value="@tag">@tag</!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="odometerRecordNotes">@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/_PlanRecordModal.cshtml

@@ -20,7 +20,7 @@
                     <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" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
+                    <input type="text" inputmode="decimal" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
                     @if (isNew)
                     {
                         @await Html.PartialAsync("_SupplyStore", "PlanRecord")
@@ -43,6 +43,14 @@
                         <!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>
+                    }
                     @if (!isNew)
                     {
                         <label>@($"{translator.Translate(userLanguage, "Date Created")}: {Model.DateCreated}")</label>

Views/Vehicle/_ReminderRecordModal.cshtml

@@ -33,7 +33,7 @@
                         <label class="form-check-label" for="reminderMetricOdometer">@translator.Translate(userLanguage,"Odometer")</label>
                     </div>     
                     <div class="input-group">
-                        <input type="number" id="reminderMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Future Odometer Reading")" value="@(isNew ? "" : Model.Mileage)">
+                        <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" onclick="appendMileageToOdometer(500)">+500</button>
                         </div>

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -23,11 +23,11 @@
                         <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" id="serviceRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when serviced")" value="@(isNew ? "" : Model.Mileage)">
+                    <input type="number" inputmode="numeric" id="serviceRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when serviced")" value="@(isNew ? "" : Model.Mileage)">
                     <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">
                     <label for="serviceRecordCost">@translator.Translate(userLanguage,"Cost")</label>
-                    <input type="text" id="serviceRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the service")" value="@(isNew ? "" : Model.Cost)">
+                    <input type="text" inputmode="decimal" id="serviceRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the service")" value="@(isNew ? "" : Model.Cost)">
                     @if (isNew)
                     {
                         @await Html.PartialAsync("_SupplyStore", "ServiceRecord")
@@ -39,6 +39,14 @@
                             <!option value="@tag">@tag</!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="serviceRecordNotes">@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/_SupplyRecordModal.cshtml

@@ -31,13 +31,28 @@
                     <div class="row">
                         <div class="col-md-6 col-12">
                             <label for="supplyRecordQuantity">@translator.Translate(userLanguage,"Quantity")</label>
-                            <input type="text" id="supplyRecordQuantity" class="form-control" placeholder="@translator.Translate(userLanguage,"Quantity")" value="@(isNew ? "1" : Model.Quantity)">
+                            <input type="text" inputmode="decimal" id="supplyRecordQuantity" class="form-control" placeholder="@translator.Translate(userLanguage,"Quantity")" value="@(isNew ? "1" : Model.Quantity)">
                         </div>
                         <div class="col-md-6 col-12">
                             <label for="supplyRecordCost">@translator.Translate(userLanguage,"Cost")</label>
-                            <input type="text" id="supplyRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost")" value="@(isNew ? "" : Model.Cost)">
+                            <input type="text" inputmode="decimal" id="supplyRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost")" value="@(isNew ? "" : Model.Cost)">
                         </div>
                     </div>
+                    <label for="supplyRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
+                    <select multiple class="form-select" id="supplyRecordTag">
+                        @foreach (string tag in Model.Tags)
+                        {
+                            <!option value="@tag">@tag</!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="supplyRecordNotes">@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/_SupplyRecords.cshtml

@@ -6,13 +6,24 @@
     var userLanguage = userConfig.UserLanguage;
     var enableCsvImports = userConfig.EnableCsvImports;
     var hideZero = userConfig.HideZero;
+    var recordTags = Model.SelectMany(x => x.Tags).Distinct();
 }
 @model List<SupplyRecord>
 <div class="row">
     <div class="d-flex justify-content-between">
         <div class="d-flex align-items-center flex-wrap">
-            <span class="ms-2 badge bg-success">@($"{translator.Translate(userLanguage,"# of Supply Records")}: {Model.Count()}")</span>
-            <span class="ms-2 badge bg-primary">@($"{translator.Translate(userLanguage,"Total")}: {Model.Sum(x => x.Cost).ToString("C")}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="count">@($"{translator.Translate(userLanguage, "# of Supply Records")}: {Model.Count()}")</span>
+            <span class="ms-2 badge bg-primary" data-aggregate-type="sum">@($"{translator.Translate(userLanguage, "Total")}: {Model.Sum(x => x.Cost).ToString("C")}")</span>
+            @foreach (string recordTag in recordTags)
+            {
+                <span onclick="filterTable('supply-tab-pane', 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>
             @if (enableCsvImports)
@@ -59,13 +70,13 @@
             <tbody>
                 @foreach (SupplyRecord supplyRecord in Model)
                 {
-                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditSupplyRecordModal(@supplyRecord.Id)">
+                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditSupplyRecordModal(@supplyRecord.Id)" data-tags='@string.Join(" ", supplyRecord.Tags)'>
                         <td class="col-2 col-xl-1">@supplyRecord.Date.ToShortDateString()</td>
                         <td class="col-2">@supplyRecord.PartNumber</td>
                         <td class="col-2">@supplyRecord.PartSupplier</td>
                         <td class="col-2 col-xl-3">@supplyRecord.Description</td>
                         <td class="col-1">@supplyRecord.Quantity</td>
-                        <td class="col-1">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
+                        <td class="col-1" data-record-type="cost">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
                         <td class="col-2 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes)</td>
                     </tr>
                 }

Views/Vehicle/_SupplyUsage.cshtml

@@ -4,6 +4,7 @@
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    var recordTags = Model.SelectMany(x => x.Tags).Distinct();
 }
 @model List<SupplyRecord>
 <div class="modal-header">
@@ -14,10 +15,16 @@
     @if (Model.Any())
     {
         <div class="row">
-            <div class="col-12" style="max-height:50vh; overflow-y:auto;">
+            <div class="col-12" style="max-height:50vh; overflow-y:auto;" id="supplies-table">
                 <div class="alert alert-warning" role="alert">
                     @translator.Translate(userLanguage,"Supplies are requisitioned immediately after the record is created and cannot be modified. If you have incorrectly entered the amount you needed you will need to correct it in the Supplies tab.")
                 </div>
+                <div class="d-flex align-items-center flex-wrap">
+                    @foreach (string recordTag in recordTags)
+                    {
+                        <span onclick="filterTable('supplies-table', this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
+                    }
+                </div>
                 <table class="table table-hover">
                     <thead class="sticky-top">
                         <tr class="d-flex">
@@ -32,9 +39,9 @@
                     <tbody>
                         @foreach (SupplyRecord supplyRecord in Model)
                         {
-                            <tr class="d-flex" id="supplyRows">
+                            <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" disabled onchange="recalculateTotal()" class="form-control"></td>
+                                <td class="col-2"><input type="text" inputmode="decimal" disabled 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>
@@ -122,7 +129,7 @@
         $("#selectSuppliesButton").attr('disabled', (hasError || totalSum == 0));
         if (!hasError) {
             return {
-                totalSum: totalSum,
+                totalSum: globalFloatToString(totalSum),
                 selectedSupplies: selectedSupplies.toArray()
             };
         } else {

Views/Vehicle/_TaxRecordModal.cshtml

@@ -25,7 +25,7 @@
                     <label for="taxRecordDescription">@translator.Translate(userLanguage,"Description")</label>
                     <input type="text" id="taxRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of tax paid(i.e. Registration)")" value="@Model.Description">
                     <label for="taxRecordCost">@translator.Translate(userLanguage,"Cost")</label>
-                    <input type="text" id="taxRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of tax paid")" value="@(isNew? "" : Model.Cost)">
+                    <input type="text" inputmode="decimal" id="taxRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of tax paid")" value="@(isNew? "" : Model.Cost)">
                     <label for="taxRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="taxRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -33,6 +33,14 @@
                             <!option value="@tag">@tag</!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="taxRecordNotes">@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/_UpgradeRecordModal.cshtml

@@ -23,11 +23,11 @@
                         <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" id="upgradeRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when upgraded/modded")" value="@(isNew ? "" : Model.Mileage)">
+                    <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>
                     <input type="text" id="upgradeRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of item(s) upgraded/modded")" value="@Model.Description">
                     <label for="upgradeRecordCost">@translator.Translate(userLanguage,"Cost")</label>
-                    <input type="text" id="upgradeRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the upgrade/mods")" value="@(isNew ? "" : Model.Cost)">
+                    <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")
@@ -39,6 +39,14 @@
                             <!option value="@tag">@tag</!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="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>

Views/Vehicle/_VehicleModal.cshtml

@@ -27,7 +27,7 @@
     <form class="form-inline">
         <div class="form-group">
             <label for="inputYear">@translator.Translate(userLanguage, "Year")</label>
-            <input type="number" id="inputYear" class="form-control" placeholder="@translator.Translate(userLanguage, "Year(must be after 1900)")" value="@(isNew ? "" : Model.Year)">
+            <input type="number" inputmode="numeric" id="inputYear" class="form-control" placeholder="@translator.Translate(userLanguage, "Year(must be after 1900)")" value="@(isNew ? "" : Model.Year)">
             <label for="inputMake">@translator.Translate(userLanguage, "Make")</label>
             <input type="text" id="inputMake" class="form-control" placeholder="@translator.Translate(userLanguage, "Make")" value="@Model.Make">
             <label for="inputModel">@translator.Translate(userLanguage, "Model")</label>

docs/documentation/API.md

@@ -0,0 +1,14 @@
+# API
+
+LubeLogger provides API endpoints to retrieve and add records, full documentation of these endpoints can be found at `/api`.
+
+## Authentication
+If authentication is enabled, it implements Basic Auth based on RFC2617, which stipulates that the "token" is passed in as a Base64-encoded string comprising of a username and password separated by a colon(":"). Because of this, neither the username nor password can contain a colon(":") character.
+
+### Testing
+You can utilize any REST API testing tool to test your use-case.
+
+## Example Use Cases
+- Send Email Reminders, see [[Reminders|Records/Reminders#reminder-emails]]
+- Insert Odometer Records, see [[Odometer|Records/Odometer#api-integration]]
+- Create DB Backups

docs/documentation/Authentication.md

@@ -0,0 +1,45 @@
+# Authentication
+
+LubeLogger does not require authentication by default; however, it is highly recommend that you set up authentication if your LubeLogger instance is accessible vvia the Internet or if you wish to invite other users to your instance.
+
+## Enabling Authentication
+To enable authentication, all you have to do is navigate to the "Settings" tab and check "Enable Authentication".
+
+A dialog will then prompt you to enter a username and password. These are the credentials for the Root/Super User.
+
+Once you have entered the credentials, click the "Setup" button and you will be redirected to a login screen, enter the credentials of the Root/Super User here to login.
+
+## Creating / Inviting New Users
+LubeLogger relies on an invitation-only model for creating/registering new users. It is highly recommended that LubeLogger is configured with SMTP in order to make the user registration process as smooth as possible, see [[Getting Started]] for more information regarding SMTP configuration.
+
+To Create/Invite New Users, you first need to enable authentication and set up the Root User credentials. Once that is done, upon login, you will see that there is now a dropdown to the right of the "Settings" tab that has your root username on it. Click on that dropdown and select "Admin Panel"
+![](/Authentication/a/image-1706398957700.png)
+
+You will now be taken to a new page. There are two sections in this page, Tokens and Users. 
+![](/Authentication/a/image-1706398972637.png)
+
+Tokens are used for invitees to register their user account or existing users to reset their password. These tokens are single use and are validated against the email address they are issued for.
+
+Users, as the name suggests, is a list of users in the system. You can also mark or unmark existing users as Admins here, see below to understand what permissions Admin users have.
+
+To invite a user, simply click on the "Generate User Token" button and type in their email address, note that this is case-sensitive. 
+![](/Authentication/a/image-1706398926360.png)
+
+If SMTP is configured and the Auto Notify(via Email) switch is checked, the user will receive an email that looks like this:
+![](/Authentication/a/image-1706398865186.png)
+
+## Root/Super User
+You might be tempted to use your root credentials as your main credentials, and there is nothing wrong that, but you should know that there are a few caveats associated with the root user.
+1. Root/Super Users can view and edit all vehicles, this might seem like a great advantage initially, but it can be problematic if there are sufficient users and you have to sift through dozens of vehicles to get to yours.
+2. Any setting you enable/disable will become the default setting inherited by new users.
+
+For the reasons above, it is highly recommended that you create a second user for personal use and mark it as an Admin. See below for a breakdown of permissions across user tiers.
+
+| Permissions            | User                                      | Admin                                     | Root/Super User        |
+| ---------------------- | ----------------------------------------- | ----------------------------------------- | ---------------------- |
+| View/Edit Vehicles     | Only vehicles which they are collaborator | Only vehicles which they are collaborator | View/Edit All Vehicles |
+| Access API             | Yes                                       | Yes                                       | Yes                    |
+|  Personalized Settings                      |      Yes                                     |   Yes                                        |    No, settings will be set as server default                    |
+| Add/Remove Users       | No                                        | Yes                                       | Yes                    |
+| Make/Restore Backups   | No                                        | No                                        | Yes                    |
+| Disable Authentication | No                                        | No                                        | Yes                    |

docs/documentation/Collaboration.md

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

docs/documentation/Configuring.md

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

docs/documentation/Dashboard.md

@@ -0,0 +1,32 @@
+# Dashboard
+
+The Dashboard is where you get an overview of your vehicle. It is the default tab that the user will see when they click into a vehicle and it is also the only tab that cannot be hidden.
+
+![](/Dashboard/a/image-1706633228249.png)
+
+The Dashboard includes the following data:
+- Expenses By Type By Year/All Time(Top-Left)
+- Total Expenses By Month By Year/All Time(Top-Center)
+- Reminders by current date or future date(Top-Right)
+- Collaborators(Bottom-Left), see [[Adding Collaborators|Vehicle Management#adding-a-collaborator]]
+- Fuel Mileage By Month By Year/All Time(Bottom-Center)
+- Vehicle Maintenance Report Generator(Bottom-Right)
+
+## Filtering Data by Year
+The year dropdown above the pie chart(top-left) allows the user to filter the aggregated data by year. The year selections are populated by retrieving all years between the year of the oldest record and the current year. If the oldest record is less than 5 years old, the selections will still be populated by the last 5 years.
+
+Note: Changing the selected year will automatically refresh the Expenses by Type Pie Chart, the Total Expenses by Month and the Fuel Mileage By Month Bar Charts.
+
+![](/Dashboard/a/image-1706477893556.png)
+
+## Vehicle Maintenance Report
+The Vehicle Maintainence Report Generator is a button that will generate a consolidated report of all work performed on the vehicle. For performance reasons, this report is designed to be printed as soon as it is generated. You can either choose to print it to paper or PDF.
+
+![](/Dashboard/a/image-1706478028103.png)
+
+## Export Attachments
+The Export Attachments button provies a convenient feature to export all attachments into a chronologically-ordered zip file. Upon clicking the button, you will be prompted to select which tabs you want attachments to be exported from.
+
+![](/Dashboard/a/image-1706574853389.png)
+
+Once you have made your selection, a zip file will be created and downloaded onto your computer. This zip file contains all of the attachments and are named in chronological order(i.e.: the oldest attachment will be named 0 and the second oldest attachment 1, 2...)

docs/documentation/FuelRecords.md

@@ -0,0 +1,62 @@
+# Fuel Records
+
+The Fuel tab keeps track of the fuel mileage for your vehicle.
+
+![](/Records/Fuel%20Records/a/image-1707455181666.png)
+
+LubeLogger supports fuel mileage calculation in the following formats:
+- American Imperial (MPG)
+- European/Asian Metric (L/100Km)
+- British(Purchase Gas in Liters and calculate fuel mileage as Miles per Imperial UK Gallons)
+- Electric Vehicles (mi./kWh or kWh/100Km)
+
+## Initial Fuel Up
+In order to calculate fuel mileage, you must first have an initial fuel entry with the current odometer reading. An odometer reading is needed so that the app can calculate the distance traveled between fuel ups. It is recommended that you fill it up to full for the first entry.
+
+## Imperfect Fuel Ups
+For the most accurate results it is recommended that you always fill your vehicle up to full and not miss any fuel ups, but sometimes things happen, which is why we provided the following:
+
+### Partial Fuel Ups
+On the occassions that you cannot fill your vehicle up to full, you can defer the fuel mileage calculation by unchecking the "Is Filled To Full" switch. Doing this tells the app to defer fuel mileage calculation until the next Full Fill Up.
+
+![](/Records/Fuel%20Records/a/image-1706406318412.png)
+
+### Missed Fuel Ups
+Check this if you have missed a fuel up record prior to adding this fuel record. This effectively resets the fuel mileage calculation and will show up as $0 or "---" in the fuel records. Checking this ensures that the average fuel mileage calculation isn't skewed due to missed fuel ups.
+
+## Calculation of Average Fuel Mileage
+Average MPG is calculated by excluding the initial and missed fuel ups, then taking the difference between the min and max odometer reading and dividing it by total amount of gas consumed(if Metric then it is further divided by 1/100). This method will include all of the gas consumed by full and partial fuel ups.
+
+## Fuel Units
+The consumption, fuel mileage, and odometer units are determined by two settings: "Use Imperial Calculation" and "Use UK MPG Calculation"
+
+| Setting | Use UK MPG Calculation Checked | Use UK MPG Calculation Unchecked |
+| -------- | -------- | -------- |
+| Use Imperial Calculation Checked    | Distance: Miles, Consumption: Liters, Fuel Mileage: Miles per UK Gallons       | Distance: Miles, Consumption: Gallons, Fuel Mileage: MPG    |
+| Use Imperial Calculation Unchecked     | Distance: Miles, Consumption: Liters, Fuel Mileage: l/100mi.    | Distance: Km, Consumption: Liters, Fuel Mileage: l/100km   |
+
+### Alternate Fuel Units
+If you wish to see alternate units which converts the calculated units within the Gas Tab, you can right click on the table headers for Consumption and Fuel Economy. These settings persists for the user, so the next time you login to LubeLogger it will automatically perform the conversion for you.
+
+![](/Records/Fuel%20Records/a/image-1706797201107.gif)
+
+#### Consumption
+For consumption, the units are cycled between US gal, Liters, and Imp Gal(UK). Changing the consumption unit will also change the unit cost.
+
+#### Fuel Economy
+The units can only toggle between l/100km and km/l, which means that this unit cannot be converted if your fuel economy unit is not l/100km. Changing the fuel economy unit will also update the values in the Average, Min, and Max Fuel Economy labels as well as the Fuel Economy Unit in the Consolidated Report.
+
+## Importing from CSV/Fuelly/SpiritMonitor.de
+LubeLogger supports importing CSV exports from other apps, below lists the column names that are acceptable/mapped to our data points:
+
+| LubeLogger Data Field                  | Imported CSV                                                   |
+| -------------------------------------- | -------------------------------------------------------------- |
+| date                                   | date, fuelup_date                                              |
+| odometer                               | odometer                                                       |
+| fuelconsumed                           | gallons, liters, litres, consumption, quantity,   fuelconsumed |
+| cost                                   | cost, total cost, totalcost,  total price                      |
+| notes                                  | notes, note                                                    |
+| partialfuelup(inverse of isfilltofull) | partial_fuelup                                                 |
+| isfilltofull                           | isfilltofull, filled up                                        |
+| missedfuelup                           | missedfuelup, missed_fuelup                                    |
+| tags                                       |        tags                                                        |

docs/documentation/GettingStarted.md

@@ -27,7 +27,7 @@ By default the app will start listening at localhost:8080, this port can be conf
 ## Windows Standalone Executable
 Windows Standalone executables are provided on a request basis, and will usually be included with every other release.
 
-To run the server, you just have to double click on CarCareTracker.exe
+To run the server, you just have to download the zip archive attached to the release, usually named LubeLogger_vNNN_win_x64.zip, extract the archive and double click on CarCareTracker.exe
 
 Occassionally you might run into an issue regarding a missing folder, to fix that, just create a "config" folder where CarCareTracker.exe is located.
 
@@ -71,5 +71,3 @@ When using this approach, the default port the app will be listening on is 5000,
 
 ## Test that It Works
 Whichever path you choose, once you get the app up and running, just navigate to the IP address and port the server is listening to and you should be able to see the app
-![image](https://github.com/hargata/lubelog/assets/155338622/a32c40ce-271c-406b-a211-c1f2af138418)
-![image](https://github.com/hargata/lubelog/assets/155338622/4e1c913c-001e-43fd-9b56-4ecffdfd4c2e)

docs/documentation/HTTPS.md

@@ -0,0 +1,46 @@
+# Set Up HTTPS
+
+LubeLogger runs on Kestrel, which is a cross-platform standalone web server provided by .NET
+
+If you're running LubeLogger behind a reverse proxy(i.e. NGINX), then this walkthrough does not apply to you since the SSL certs will be served up by NGINX instead of Kestrel.
+
+This article covers the step-by-step process to set up HTTPS for a LubeLogger instance.
+
+## Docker
+If you're running LubeLogger on a Docker instance, first read [this article by Microsoft](https://learn.microsoft.com/en-us/aspnet/core/security/docker-compose-https?view=aspnetcore-8.0)
+
+1. Convert the .PEM / .CRT files into .PFX, read [this StackOverflow post](https://stackoverflow.com/questions/808669/convert-a-cert-pem-certificate-to-a-pfx-certificate)
+2. Open and modify the .env file and add the following lines(note that in this example I used bob as the password for the cert)
+```
+ASPNETCORE_Kestrel__Certificates__Default__Password=bob
+ASPNETCORE_Kestrel__Certificates__Default__Path=/https/<yourPFXCertificateName>.pfx
+ASPNETCORE_URLS=https://+:443;http://+:80
+```
+3. Open and modify docker-compose.yml. You will need to bind a new volume to the Docker container so that Kestrel can access the certificate file.
+```
+    volumes:
+      - ~/https/:/https:ro
+```
+4. Run `docker-compose up -d` to start up the container and `https://localhost` will now have a valid cert.
+
+## Windows
+If you're running LubeLogger as the standalone Windows executable, first read [this article by Microsoft](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel/endpoints?view=aspnetcore-8.0#configure-https-in-appsettingsjson)
+
+1. Convert the .PEM / .CRT files into .PFX, read [this StackOverflow post](https://stackoverflow.com/questions/808669/convert-a-cert-pem-certificate-to-a-pfx-certificate)
+2. Open and modify appsettings.json located in the same directory as the CarCareTracker executable and add the following lines(note that in this example I used bob as the password for the cert)
+```
+"Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:80"
+      },
+      "HttpsInlineCertFile": {
+        "Url": "https://localhost:443",
+        "Certificate": {
+          "Path": "<path to .pfx file>",
+          "Password": "bob"
+        }
+      }
+}
+```
+3. Restart the app and `https://localhost` will now have a valid cert.

docs/documentation/Notes.md

@@ -0,0 +1,25 @@
+# Notes
+
+The Notes tab contains important notes about your vehicle.
+
+## Markdown Parsing
+Markdown formatting is supported across all Notes fields in the app. The underlying markdown parser is [Drawdown](https://github.com/adamvleggett/drawdown). To toggle between edit and preview mode, simply click on the markdown icon next to the "Notes" label.
+
+![](/Records/Notes/a/image-1706634016273.png)
+
+![](/Records/Notes/a/image-1706634022811.png)
+
+There is also a setting, that when enabled, will automatically load all notes in Markdown form when viewing existing records. The only exception is when an existing record has an empty notes field.
+
+## Pinned Notes
+Notes can be pinned by checking the "Pinned" switch when creating or editing a note.
+
+![](/Records/Notes/a/image-1706633376978.png)
+
+Pinned Notes will always show up at the very top of the list.
+
+![](/Records/Notes/a/image-1706455413890.png)
+
+On non-touchscreen devices, pinned notes can be viewed when the user hovers over the vehicle tile in the garage. On mobile, the user have to hold down on the garage tile in order for the pinned notes to show up.
+
+![](/Records/Notes/a/image-1706455460700.png)

docs/documentation/Odometer.md

@@ -0,0 +1,14 @@
+# Odometer
+
+The Odometer tab is where you can log your current odometer reading without having to insert any Service/Repair/Upgrade/Fuel records. This odometer readings entered in this tab allows Reminder urgencies to be calculated as accurately as possible since it uses the maximum mileage reported in each of the tabs to determine the last reported mileage.
+
+The Odometer tab is hidden by default and must be enabled by checking the "Odometer" switch under "Visible Tabs" in the Settings tab.
+
+## API Integration
+As with the other tabs, odometer readings can be retrieved via a GET endpoint and inserted via a POST API endpoint.
+
+Example use cases:
+- An app to integrate with OBDII and insert odometer reading from the vehicle's computer onto LubeLogger.
+- An app to keep track of distance traveled via GPS and incrementing the last reported odometer reading.
+
+These are not functionalities provided out of the box by LubeLogger, and are just examples of the possibilities achievable via the API endpoints.

docs/documentation/Planner.md

@@ -0,0 +1,62 @@
+# Planner
+
+The Planner tab is where you can plan and track progress of future or current plans for your vehicle. The planner tab consists of 4 swimlanes(vertical panels) where plans can be moved to different stages via drag and drop.
+
+![](/Records/Planner/a/image-1706459391188.png)
+
+The records stored in Service/Repair/Upgrade tabs tend to be inserted retroactively(after the work is done), hence the Planner tab was developed to keep track of To-Do's.
+
+## Adding a new Plan
+The Planner tab is hidden by default, you must enable it by checking the "Planner" switch under "Visible Tabs" within the Settings tab.
+
+To add a new plan, simply click on the "Add Plan Record" button and fill in the details of the plan.
+
+![](/Records/Planner/a/image-1707453045755.png)
+
+## Plan Type
+You are required to select at least one Plan Type - Service, Repair, or Upgrade. When the Plan Record is moved to Done, the Plan Record will be automatically converted into the selected type and it will then show up in its respective tab. The type is indicated by an icon corresponding to their respective tabs.
+
+## Plan Priority
+Within the swimlanes, plans are sorted from Critical priority to Low priority. They are also indicated by an icon - Fire for Critical, Waves for Normal, and Snowflake for Low.
+
+![](/Records/Planner/a/image-1706459640917.png)
+
+## Plan Stages
+**Planned** - This is considered the backlog, where no work has been performed yet. i.e.: Shopping for a lift kit.
+
+**Doing** - This is when work has been started on the task. i.e.: Installing the lift kit.
+
+**Testing** - This is where the work is being reviewed / tested. i.e.: Going for a test drive with the lift kit.
+
+**Done** - This is where the work is marked as completed.
+
+### Updating Plan Stages
+There are two ways you can update the stage a plan is currently in: drag and drop or updating it via the dropdown when editing a plan. You can backtrack a plan's stages within Planned, Doing, and Testing. i.e.: You can move the plan back from Testing to Doing if you find out there is more work to be done.
+
+### Moving to Done
+when a Plan is being moved to Done, it will prompt you to enter the current odometer reading. This is to ensure that the Service/Repair/Upgrade record that will be created from it contains the most up-to-date odometer reading.
+
+Once a Plan has been marked as Done, it can never be taken out of it. The only action that can be performed on it is Delete. You can delete Plans in the Done stage by clicking on them.
+
+## Plan Templates
+For records that have a fixed interval(i.e. oil changes), it is recommended that you create a Plan Template instead.
+
+### Creating a Template
+To create a template, simply fill in the details / select the supplies to requisition for the plan, but instead of clicking the "Add New Plan Record" button, you will click on the dropdown next to it and select "Save As Template"
+
+![](/Records/Planner/a/image-1707453250314.png)
+
+The template will now be created and named after the description of the plan record.
+
+### Using Templates
+To create a plan record from a template, click on the "View Templates button" and a dialog will show up with the saved templates for the vehicle
+
+![](/Records/Planner/a/image-1707453421824.png)
+
+![](/Records/Planner/a/image-1707453431731.png)
+
+The shop icon indicates if the template has supplies requisition and the paper clip icon(not shown) indicates if the template has file attachments.
+
+To use the template, simply click on the "+" button. The app will then perform a check to ensure that there are sufficient quantities of the supplies used by the template. If there are insufficient quantities, an error message will pop up telling you which supply is short.
+
+![](/Records/Planner/a/image-1707453639902.png)

docs/documentation/Postgres.md

@@ -0,0 +1,53 @@
+# Postgres
+
+For users that desire additional scalability for their backend, LubeLogger now supports a PostgreSQL backend.
+
+## Configuration
+
+To configure LubeLogger to use PostgreSQL, you must first create a database with a schema named "app" in it, in the screenshot below we created a DB named "lubelogger" and then a schema named "app".
+
+![](/Postgres/a/image-1707454502212.png)
+
+Once that is done, simply inject the environment variable `POSTGRES_CONNECTION` with your connection string, example:
+
+```
+Host=<yourserveraddress:port>;Username=<yourusername>;Password=<yourpassword>;Database=<databasename>;
+```
+
+LubeLogger will then automatically create the tables it needs, all records will then be saved and loaded from Postgres tables from now on.
+
+## Backups
+
+Once you have switched over to Postgres, LubeLogger's built in and backup function will only back up images, documents, and the server config. You are responsible for maintaining backups of the DB records.
+
+## Database Migration
+
+A tool is provided to ease the migration process between LiteDB and Postgres. This tool can be found at the `/migration` endpoint and is only accessible when a Postgres connection is provided.
+
+![](/Postgres/a/image-1707516092170.png)
+
+### Importing to Postgres
+
+To transfer all your existing data from LiteDB to Postgres:
+1. Create a backup using the "Make Backup" feature in the Settings tab.
+2. Extract the zip file.
+3. You should see a folder named "data" in the extracted folder
+4. Inside the data folder will be a .db file named `cartracker.db`
+5. Navigate to the Database Migration tool
+6. Click "Import to Postgres"
+7. Select the `cartracker.db` file
+8. Your data will be imported into your Postgres DB, and you may double check that the DB has been imported successfully using a Postgres DB Administration Tool.
+
+### Exporting from Postgres
+
+In the event that you need to transfer all your data back onto a LiteDB database file from Postgres, you may do so using the Database Migration tool:
+1. Navigate to the Database Migration Tool
+2. Click "Export from Postgres"
+3. Extract the downloaded zip file and you should find `cartracker.db` in it.
+4. Create a backup using the "Make Backup" feature in the Settings tab.
+5. Extract the zip file.
+6. You should see a folder named "data" in the extracted folder, if not, create it.
+7. Place `cartracker.db` inside the "data" folder
+8. Re-zip the extracted folder
+9. Restore the backup using the "Restore Backup" feature in the Settings tab.
+10. Make sure you remove the PostgreSQL connection from the environment variables so that all future changes will be saved in LiteDB.

docs/documentation/Registration.md

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

docs/documentation/Reminders.md

@@ -0,0 +1,49 @@
+# Reminders
+
+Reminders are future tasks where the urgency are based on how close the user is to the due date or odometer reading.
+
+![](/Records/Reminders/a/image-1706403372050.png)
+
+## Adding Reminders
+Reminders can either be added directly on the Reminders tab by clicking the "Add Reminder" button or via adding a new [[Service/Repair/Upgrade Record|Records/Service Records#adding-reminders]].
+
+## Reminder Metrics
+Similar to the maintenance schedule outlined in your vehicle's user manual, the urgency of a Reminder can be set either via a due date, a future odometer reading, or whichever comes first.
+
+![](/Records/Reminders/a/image-1706403594197.png)
+
+## Reminder Urgency
+Depending on the metric selected, reminder urgency is calculated either via the server's current date, the max odometer reading across the Odometer/Service/Repair/Upgrade/Fuel tabs, or whichever comes first.
+
+| Urgency    | Due Date      | Future Odometer Reading |
+| ---------- | ------------- | ----------------------- |
+| Not Urgent | > 30 days out | > 100 miles out         |
+| Urgent     | < 30 days out | < 100 miles out         |
+|  Very Urgent          |     < 7 days out         |        < 50 miles out                 |
+|   Past Due         |   > 0 days past            |     > 0 miles past                    |
+
+## Recurring Reminders
+Reminders can be set to become recurring so that you don't have to create a new reminder for recurring maintenance such as oil changes. When you have completed the task set by the reminder, you can either have it automatically refresh when it lapses or by manually refreshing it. Refreshing a reminder effectively pushes out the due date or the odometer reading based on the recurring interval, i.e.: if a Reminder is due at 10000 miles and the interval is set at every 5000 miles, refreshing the Reminder will push the future odometer reading out to 15000 miles.
+
+### Automatically Refresh Past Due Reminders
+There is a setting within the Settings tab that allows users to automatically refresh past due reminders. Note that with this setting enabled, any reminder that becomes Past Due will be automatically refreshed, this requires a lot of diligence from the user to heed their reminders and stay on top of it.
+
+![](/Records/Reminders/a/image-1706404019404.png)
+
+### Manually Refresh Reminders
+When a recurring reminder falls into Very Urgent or Past Due status, there will be a button on the Reminders page that will allow the user to manually refresh the reminder.
+
+![](/Records/Reminders/a/image-1706404336137.png)
+
+This reminder is set to be recurring every 1 year, so when the "Done" button is clicked, it will push the due date of this reminder to 1/31/2025.
+
+![](/Records/Reminders/a/image-1706404394320.png)
+
+![](/Reminders/a/image-1706404403748.png)
+
+## Reminder Emails
+If SMTP is configured within LubeLogger, the Root User can set up a cron / scheduled task that runs at an interval to send out emails to collaborators of vehicles with reminders. The API endpoint allows the user to specify what level of urgencies should the user be notified of.
+
+Sample bash script: https://github.com/hargata/lubelog_scripts/blob/main/bash/sendreminders.sh
+
+The sample provided above will send email reminders out for reminders of all urgencies.

docs/documentation/ReplacingTheLogo.md

@@ -0,0 +1,19 @@
+# Replacing The LubeLogger Logo
+
+You can overwrite the LubeLogger Logo that is displayed in the Login and Home/Garage page.
+
+To do so, simply inject an environment variable with the key `LUBELOGGER_LOGO_URL` into your lubelogger instance either via the .env file or the appsettings.json file.
+
+## .env
+```
+LUBELOGGER_LOGO_URL=<URL to your Logo>
+```
+
+## appsettings.json
+```
+LUBELOGGER_LOGO_URL:<URL to your Logo>
+```
+
+## Non-replaceable Locations
+- Logo in the About section in the Settings tab
+- Logo that shows up in the top left of the Vehicle Maintenance History Report

docs/documentation/ServiceRecords.md

@@ -0,0 +1,36 @@
+# Service/Repair/Upgrade Records
+These three are perhaps the most important tabs in LubeLogger. They are functionally identically to one another, except for the type of records stored in them.
+
+Service Records: These are planned/scheduled maintenance performed on the vehicle, usually on a fixed interval. Examples include oil changes, brakes, tires, spark plugs, air filter.
+
+Repair Records: These are unplanned/unscheduled work performed on the vehicle whether due to an accident, a component breaking unexpectedly, or a broken component with no fixed maintenance interval. Examples include replacing the alternators, starters, radiators, power steering pump, bumpers.
+
+Upgrade Records: These are work performed on the vehicle that enhances the functionality or aesthetics of the vehicle. Examples include: roof racks, lift kits, aftermarket wheels, stereos.
+
+To add a new record, simply navigate to the tab and click the "Add New Service/Repair/Upgrade Record" button and you will be prompted to input the details of the record.
+
+![](/Records/Service%20Records/a/image-1706797383329.png)
+
+## Moving Records
+To move existing records between the three tabs, simply click on the dropdown button to the right of the Delete button and select the tab to move the record to.
+
+![](/Records/Service%20Records/a/image-1706797399768.png)
+
+## Supplies Requisition
+If you have supplies set up, you can click the "Choose Supplies" link under the Cost field, and a dialog will prompt you to select the supplies and quantity of each supplies you wish to requisition for this record.
+
+![](/Records/Service%20Records/a/image-1706402198461.png)
+
+Once you have selected the supplies, the Cost field will automatically update to reflect the costs of the supplies you have selected based on the quantity of each supply. Note that at this point, before the record is created, the supply is not requisitioned yet and you can still edit the selected supplies/quantities.
+
+Once the record has been created, the supplies will be requisitioned and the quantity / cost of the supplies will be deducted according to the usage. This cannot be reversed(i.e.: you cannot restore the quantities by editing an existing service/repair/upgrade record), you have to go to the Supplies tab to correct the quantity/cost of the supply.
+
+### Supplies Unit Cost Calculation
+LubeLogger is not an inventory management system. Unit costs are calculated as an average of total spent / quantity, which means that everytime you replenish your supplies, it will average out the cost even if the latest batch of supplies you purchased is significantly costlier than the last batch. There is no LIFO/FIFO/FAFO inventory valuation methods.
+
+For more information on Supplies, see [[Supplies|Records/Supplies]]
+
+## Adding Reminders
+You are given the option to set a reminder upon creating a record. This is helpful for recurring services such as Oil Changes. To do so, simply check the "Add Reminder" switch before clicking the "Add New Service Record" button. A new dialog will show up after the record has been created and all the fields will be pre-populated.
+
+For more information on Reminders, see [[Reminders|Records/Reminders]]

docs/documentation/Supplies.md

@@ -0,0 +1,27 @@
+# Supplies
+
+The Supplies tab is where you can keep track of supplies or parts purchased for your vehicle, either as spare parts or for future use.
+
+![](/Records/Supplies/a/image-1706402930133.png)
+
+The Supplies tab is hidden by default and requires the user to enable it via the Settings tab under the "Visible Tabs" section.
+
+![](/Records/Supplies/a/image-1706403044005.png)
+
+To add a new Supply Record, simply click the "Add New Supply Record" button and you will be prompted for the details of the Supply.
+
+![](/Records/Supplies/a/image-1706403006743.png)
+
+Supplies that are in the system that have a quantity greater than zero are available for [[Requisitioning|Records/Service Records#supplies-requisition]]
+
+## Shop Supplies
+
+Shop supplies are for supplies that are at a garage level and is available for requisitioning across all vehicles. This is useful for supplies that are shared across multiple vehicles such as motor oil, washer fluid, tires, etc.
+
+![](/Records/Supplies/a/image-1707454148363.png)
+
+This tab is disabled by default, but can be enabled by the Root User in the Settings tab.
+
+![](/Records/Supplies/a/image-1707454169597.png)
+
+Note that shop supplies are available for all users and all vehicles, do not enable this if you don't wish to share supplies with other users. When enabled, any user can add / edit / delete any shop supplies.

docs/documentation/Taxes.md

@@ -0,0 +1,22 @@
+# Taxes
+The Taxes tab keeps track of fees and expenses that are incurred by your vehicle that are unrelated to odometer readings.
+
+![](/Records/Taxes/a/image-1706496894832.png)
+
+Examples of records that can be recorded in the Taxes tab include: 
+- Registration Fee/Road Tax
+- Insurance
+- Fines/Citations
+- Roadside Assistance
+- Car Washes
+- and more!
+
+## Recurring Taxes
+Taxes can be set to be recurring so that a new record is created at every interval. The newly-created tax record is duplicated from the last recurrence.
+
+![](/Records/Taxes/a/image-1706496915044.png)
+
+The way this functionality works is that when the user clicks into a vehicle detail, a check is performed if there are any recurring tax records that are past due. If there are, those tax records are then duplicated with the due date pushed out by the set interval. The newly duplicated will be set to recur at the set interval while the tax record that was past due will have recurrance disabled.
+
+### Notes on Recurring Taxes
+Since recurring taxes are duplicated from the previous occurrence, it is not recommended for fees with differing values be set up as recurring, i.e.: Registration Fees do not stay constant year to year in most if not all parts of the United States, even if most people renew their vehicle's registration at the same time every year.

docs/documentation/Translations.md

@@ -0,0 +1,35 @@
+# Translations
+
+LubeLogger supports UI Translations for ~95% of UI elements.
+
+The following are not covered by translations:
+- Toasts(messages that pop up on the top right)
+- Sweetalert prompts(confirm delete dialogs, etc)
+- About section
+
+## Where to get translations
+Translations can be found at [this repository](https://github.com/hargata/lubelog_translations/)
+
+1. To upload a translation file, login as the root user.
+2. Navigate to "Settings"
+3. Click "Upload" under the "Manage Languages" section
+![](/Translations/a/image-1707068703210.png)
+
+4. Select the language file you wish to upload
+5. The page should refresh
+6. Select the language file from the dropdown to set it as your default language.
+
+## Creating your own translation
+1. Download the [latest en_US.json](https://github.com/hargata/lubelog/blob/main/wwwroot/defaults/en_US.json) file from the GitHub Repository for LubeLogger.
+2. Rename this file, en_US is a reserved name.
+3. Use a JSON pretty-printer to make it human-readable
+![](/Translations/a/image-1707068227706.png)
+
+3. The objects to the left of the ":" are the translation keys, DO NOT modify these.
+4. The objects to the right of the ":" are the translation values(shown in green), these are what you want to translate.
+5. To test out your translation, simply upload it to your LubeLogger instance and test it out.
+
+## Contribute
+Follow the instructions outlined in the [official repository](https://github.com/hargata/lubelog_translations/)
+
+Translation efforts are coordinated via [this thread](https://github.com/hargata/lubelog/discussions/240)

docs/documentation/Troubleshooting.md

@@ -0,0 +1,56 @@
+# Troubleshooting
+Common issues and steps you can take to fix them.
+
+## General Issues
+
+### Button doesn't work / feature stopped working.
+Your browser might have cached an older version of a JavaScript(JS) file which is no longer compatible with the current version of LubeLogger. Clear your browser's cache and retry.
+
+### Can't Send Email via SMTP
+Note that for most email providers, you can no longer use your account password to authenticate and must instead generate an app password for LubeLogger to be able to authenticate on your behalf to your email provider's SMTP server.
+
+If you've downloaded the .env file from the GitHub repo, there is an issue with how the file gets formatted when it is downloaded, you will have to copy the contents and re-create one manually on your machine.
+
+### Console shows Authentication Errors
+Those are purely informational, add a line in your environment variables to prevent information logs from showing up in the console.
+
+## Locale Issues
+
+### Can't input values in "," format / shows up as 0.
+Ensure that your locale environment variables are configured correctly, note that if running via docker, both environment variables LANG and LC_ALL have to be identical.
+
+### Can't change locale.
+Environment variables are injected on deployment. You will need to re-deploy.
+
+## Server Issues
+
+### NGINX / Cloudflare 
+LubeLogger is a web app that runs on Kestrel, it literally doesn't matter if it's deployed behind a reverse proxy or Cloudflare tunnel. As long as the app can receive traffic on the port it's configured on, it will run.
+
+Here's a sample Nginx reverse proxy configuration courtesy of [thehijacker](https://github.com/thehijacker)
+```
+server
+{
+    listen 443 ssl http2;
+    server_name lubelogger.domain.com;
+
+    ssl_certificate /etc/nginx/ssl/acme/domain.com/fullchain.pem;
+    ssl_certificate_key /etc/nginx/ssl/acme/domain.com/key.pem;
+    ssl_dhparam /etc/nginx/ssl/acme/domain.com/dhparams.pem;
+    ssl_trusted_certificate /etc/nginx/ssl/acme/domain.com/fullchain.pem;
+
+    location /
+    {
+        proxy_pass http://192.168.28.53:8289;
+        client_max_body_size               50000M;
+        proxy_set_header Host              $http_host;
+        proxy_set_header X-Real-IP         $remote_addr;
+        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade    $http_upgrade;
+        proxy_set_header   Connection "upgrade";
+        proxy_redirect off;
+    }
+}
+```

docs/documentation/VehicleManagement.md

@@ -0,0 +1,50 @@
+# Vehicle Management
+
+## Adding a Vehicle
+To add a vehicle, simply click on the green "+" button in the "Garage" tab. A dialog will then prompt you for the following details of the vehicle you wish to add: Year, Make, Model, License Plate, and optionally, a picture of the vehicle. If it's an Electric Vehicle, you should check the "Electric Vehicle" switch. This ensures that "fuel" economy is measured in kWh instead of gallons or liters.
+
+![](/Vehicle%20Management/a/image-1706759765922.png)
+
+Once you're done, click "Add New Vehicle" and the vehicle will now be visible in the Garage Tab.
+
+![](/Vehicle%20Management/a/image-1706759782021.png)
+
+### Sorting Vehicles
+To sort vehicles by Year, simply right click on the Garage tab while the tab is selected.
+
+On mobile, make sure the Garage tab is selected and long hold on the garage menu button.
+
+## Editing a Vehicle
+To edit an existing vehicle, go into the vehicle details by clicking on the vehicle tile in the Garage. If you're on a computer/tablet, there will be a yellow button on the top right of the screen, click it to edit details regarding the vehicle.
+
+![](/Vehicle%20Management/a/image-1706759823490.png)
+
+On mobile devices, the "Edit Vehicle" button is available within the menu
+
+![](/Vehicle%20Management/a/image-1706400015891.png)
+
+## Deleting a Vehicle.
+To delete an existing vehicle, click on the "Manage Vehicle" dropdown and select "Delete Vehicle". You will then be prompted for confirmation before the vehicle is deleted. Once the vehicle is deleted, you will be redirected back to the Garage.
+
+![](/Vehicle%20Management/a/image-1706400064717.png)
+
+On mobile devices, the "Delete Vehicle" button is available within the menu, located at the very bottom.
+
+![](/Vehicle%20Management/a/image-1706400198451.png)
+
+## Adding a Collaborator
+If more than one individual logs records to your vehicle(e.g.: spouse, employee, etc) and they have their own user account with LubeLogger, you can add them as a collaborator.
+
+To add new collaborator, simply navigate to the Dashboard tab in the vehicle details view and look to the bottom right:
+
+![](/Vehicle%20Management/a/image-1706400316910.png)
+
+Click on the blue Add User icon on the top left of the Collaborators panel and you will be prompted to type in their username, note that a user with that username must exist in the system or you will get an error.
+
+![](/Vehicle%20Management/a/image-1706400382568.png)
+
+Once you have added them as a collaborator, their name will now show up in the Collaborators list, and you will also be given the option to remove them.
+
+![](/Vehicle%20Management/a/image-1706400425454.png)
+
+Once this is done, you should have the new collaborator refresh their browser and they should be able to see the vehicle in their Garage.

wwwroot/css/site.css

@@ -303,4 +303,26 @@ input[type="file"] {
 }
 .override-hide{
     display: none !important;
+}
+.reminderCalendarViewContent .datepicker, .reminderCalendarViewContent .datepicker-inline, .reminderCalendarViewContent .datepicker-days, .reminderCalendarViewContent .table-condensed {
+    width: 100%;
+    height: 100%;
+    table-layout: fixed;
+    cursor: default;
+}
+.reminder-exist{
+    overflow:auto;
+    vertical-align:top;
+}
+.reminder-exist p{
+    margin:0;
+}
+.reminderCalendarViewContent .datepicker table tr td.day {
+    cursor: default;
+}
+.reminderCalendarViewContent .datepicker table tr td.day:hover {
+    cursor: default;
+}
+.reminder-calendar-item{
+    cursor: pointer;
 }

wwwroot/js/collisionrecord.js

@@ -88,6 +88,10 @@ function getAndValidateCollisionRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (collisionDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#collisionRecordDate").addClass("is-invalid");
@@ -124,6 +128,7 @@ function getAndValidateCollisionRecordValues() {
         files: uploadedFiles,
         supplies: selectedSupplies,
         tags: collisionTags,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/garage.js

@@ -41,11 +41,123 @@ function bindTabEvent() {
             case "supply-tab":
                 getVehicleSupplyRecords();
                 break;
+            case "calendar-tab":
+                getVehicleCalendarEvents();
+                break;
         }
         switch (e.relatedTarget.id) { //clear out previous tabs with grids in them to help with performance
             case "supply-tab":
                 $("#supply-tab-pane").html("");
                 break;
+            case "calendar-tab":
+                $("#calendar-tab-pane").html("");
+                break;
+        }
+    });
+}
+function getVehicleCalendarEvents() {
+    $.get('/Home/Calendar', function (data) {
+        if (data) {
+            $("#calendar-tab-pane").html(data);
+        }
+    });
+}
+function showCalendarReminderModal(id) {
+    event.stopPropagation();
+    $.get(`/Home/ViewCalendarReminder?reminderId=${id}`, function (data) {
+        if (data) {
+            $("#reminderRecordCalendarModalContent").html(data);
+            $("#reminderRecordCalendarModal").modal('show');
+            $('#reminderRecordCalendarModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("reminderNotes");
+                }
+            });
+        }
+    })
+}
+function hideCalendarReminderModal() {
+    $("#reminderRecordCalendarModal").modal('hide');
+}
+function generateReminderItem(id, urgency, description) {
+    if (description.trim() == '') {
+        return;
+    }
+    switch (urgency) {
+        case "VeryUrgent":
+            return `<p class="badge text-wrap bg-danger reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
+        case "PastDue":
+            return `<p class="badge text-wrap bg-secondary reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
+        case "Urgent":
+            return `<p class="badge text-wrap bg-warning reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
+        case "NotUrgent":
+            return `<p class="badge text-wrap bg-success reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
+    }
+}
+function markDoneCalendarReminderRecord(reminderRecordId, e) {
+    event.stopPropagation();
+    $.post(`/Vehicle/PushbackRecurringReminderRecord?reminderRecordId=${reminderRecordId}`, function (data) {
+        if (data) {
+            hideCalendarReminderModal();
+            successToast("Reminder Updated");
+            getVehicleCalendarEvents();
+        } else {
+            errorToast(genericErrorMessage());
+        }
+    });
+}
+function deleteCalendarReminderRecord(reminderRecordId, e) {
+    if (e != undefined) {
+        event.stopPropagation();
+    }
+    $("#workAroundInput").show();
+    Swal.fire({
+        title: "Confirm Deletion?",
+        text: "Deleted Reminders cannot be restored.",
+        showCancelButton: true,
+        confirmButtonText: "Delete",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post(`/Vehicle/DeleteReminderRecordById?reminderRecordId=${reminderRecordId}`, function (data) {
+                if (data) {
+                    hideCalendarReminderModal();
+                    successToast("Reminder Deleted");
+                    getVehicleCalendarEvents();
+                } else {
+                    errorToast(genericErrorMessage());
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
+function initCalendar() {
+    if (groupedDates.length == 0) {
+        //group dates
+        eventDates.map(x => {
+            var existingIndex = groupedDates.findIndex(y => y.date == x.date);
+            if (existingIndex == -1) {
+                groupedDates.push({ date: x.date, reminders: [`${generateReminderItem(x.id, x.urgency, x.description)}`] });
+            } else if (existingIndex > -1) {
+                groupedDates[existingIndex].reminders.push(`${generateReminderItem(x.id, x.urgency, x.description)}`);
+            }
+        });
+    }
+    $(".reminderCalendarViewContent").datepicker({
+        startDate: "+0d",
+        format: getShortDatePattern().pattern,
+        todayHighlight: true,
+        beforeShowDay: function (date) {
+            var reminderDateIndex = groupedDates.findIndex(x => (x.date == date.getTime() || x.date == (date.getTime() - date.getTimezoneOffset() * 60000))); //take into account server timezone offset
+            if (reminderDateIndex > -1) {
+                return {
+                    enabled: true,
+                    classes: 'reminder-exist',
+                    content: `<div class='text-wrap' style='height:20px;'><p>${date.getDate()}</p>${groupedDates[reminderDateIndex].reminders.join('<br>')}</div>`
+                }
+            }
         }
     });
 }

wwwroot/js/gasrecord.js

@@ -87,6 +87,10 @@ function getAndValidateGasRecordValues() {
     var gasRecordId = getGasRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (gasDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#gasRecordDate").addClass("is-invalid");
@@ -134,7 +138,8 @@ function getAndValidateGasRecordValues() {
         tags: gasTags,
         isFillToFull: gasIsFillToFull,
         missedFuelUp: gasIsMissed,
-        notes: gasNotes
+        notes: gasNotes,
+        extraFields: extraFields.extraFields
     }
 }
 

wwwroot/js/login.js

@@ -59,4 +59,12 @@ function handlePasswordKeyPress(event) {
     if (event.keyCode == 13) {
         performLogin();
     }
+}
+
+function remoteLogin() {
+    $.get('/Login/GetRemoteLoginLink', function (data) {
+        if (data) {
+            window.location.href = data;
+        }
+    })
 }

wwwroot/js/odometerrecord.js

@@ -85,6 +85,10 @@ function getAndValidateOdometerRecordValues() {
     var odometerRecordId = getOdometerRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (serviceDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#odometerRecordDate").addClass("is-invalid");
@@ -105,6 +109,7 @@ function getAndValidateOdometerRecordValues() {
         mileage: serviceMileage,
         notes: serviceNotes,
         tags: serviceTags,
-        files: uploadedFiles
+        files: uploadedFiles,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/planrecord.js

@@ -159,6 +159,10 @@ function getAndValidatePlanRecordValues() {
     var planRecordId = getPlanRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (planDescription.trim() == '') {
         hasError = true;
         $("#planRecordDescription").addClass("is-invalid");
@@ -183,7 +187,8 @@ function getAndValidatePlanRecordValues() {
         supplies: selectedSupplies,
         priority: planPriority,
         progress: planProgress,
-        importMode: planType
+        importMode: planType,
+        extraFields: extraFields.extraFields
     }
 }
 //drag and drop stuff.
@@ -216,7 +221,7 @@ function updatePlanRecordProgress(newProgress) {
             Swal.fire({
                 title: 'Mark Task as Done?',
                 html: `<p>To confirm, please enter the current odometer reading on your vehicle, as we also need the current odometer to auto convert the task into the relevant record.</p>
-                            <input type="text" id="inputOdometer" class="swal2-input" placeholder="Odometer Reading">
+                            <input type="text" inputmode="numeric" id="inputOdometer" class="swal2-input" placeholder="Odometer Reading">
                             `,
                 confirmButtonText: 'Confirm',
                 showCancelButton: true,

wwwroot/js/reminderrecord.js

@@ -22,7 +22,7 @@ function checkCustomMonthInterval() {
         Swal.fire({
             title: 'Specify Custom Month Interval',
             html: `
-                            <input type="text" id="inputCustomMileage" class="swal2-input" placeholder="Months">
+                            <input type="text" inputmode="numeric" id="inputCustomMileage" class="swal2-input" placeholder="Months">
                             `,
             confirmButtonText: 'Set',
             focusConfirm: false,
@@ -51,7 +51,7 @@ function checkCustomMileageInterval() {
         Swal.fire({
             title: 'Specify Custom Mileage Interval',
             html: `
-                            <input type="text" id="inputCustomMileage" class="swal2-input" placeholder="Mileage">
+                            <input type="text" inputmode="numeric" id="inputCustomMileage" class="swal2-input" placeholder="Mileage">
                             `,
             confirmButtonText: 'Set',
             focusConfirm: false,

wwwroot/js/servicerecord.js

@@ -88,6 +88,10 @@ function getAndValidateServiceRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (serviceDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#serviceRecordDate").addClass("is-invalid");
@@ -124,6 +128,7 @@ function getAndValidateServiceRecordValues() {
         files: uploadedFiles,
         supplies: selectedSupplies,
         tags: serviceTags,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/shared.js

@@ -160,6 +160,11 @@ function bindWindowResize() {
         hideMobileNav();
     });
 }
+function encodeHTMLInput(input) {
+    const encoded = document.createElement('div');
+    encoded.innerText = input;
+    return encoded.innerHTML;
+}
 function decodeHTMLEntities(text) {
     return $("<textarea/>")
         .html(text)
@@ -386,4 +391,25 @@ function showBulkImportModal(mode) {
 }
 function hideBulkImportModal() {
     $("#bulkImportModal").modal('hide');
+}
+function getAndValidateExtraFields() {
+    var hasError = false;
+    var outputData = [];
+    $(".extra-field").map((index, elem) => {
+        var extraFieldName = $(elem).children("label").text();
+        var extraFieldInput = $(elem).children("input");
+        var extraFieldValue = extraFieldInput.val();
+        var extraFieldIsRequired = extraFieldInput.hasClass('extra-field-required');
+        if (extraFieldIsRequired && extraFieldValue.trim() == '') {
+            hasError = true;
+            extraFieldInput.addClass("is-invalid");
+        } else {
+            extraFieldInput.removeClass("is-invalid");
+        }
+        //only push fields with value in them
+        if (extraFieldValue.trim() != '') {
+            outputData.push({ name: extraFieldName, value: extraFieldValue, isRequired: extraFieldIsRequired });
+        }
+    });
+    return { hasError: hasError, extraFields: outputData };
 }

wwwroot/js/supplyrecord.js

@@ -4,6 +4,7 @@
             $("#supplyRecordModalContent").html(data);
             //initiate datepicker
             initDatePicker($('#supplyRecordDate'));
+            initTagSelector($("#supplyRecordTag"));
             $('#supplyRecordModal').modal('show');
         }
     });
@@ -14,6 +15,7 @@ function showEditSupplyRecordModal(supplyRecordId) {
             $("#supplyRecordModalContent").html(data);
             //initiate datepicker
             initDatePicker($('#supplyRecordDate'));
+            initTagSelector($("#supplyRecordTag"));
             $('#supplyRecordModal').modal('show');
             $('#supplyRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
                 if (getGlobalConfig().useMarkDown) {
@@ -82,10 +84,15 @@ function getAndValidateSupplyRecordValues() {
     var supplyQuantity = $("#supplyRecordQuantity").val();
     var supplyCost = $("#supplyRecordCost").val();
     var supplyNotes = $("#supplyRecordNotes").val();
+    var supplyTags = $("#supplyRecordTag").val();
     var vehicleId = GetVehicleId().vehicleId;
     var supplyRecordId = getSupplyRecordModelData().id;
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (supplyDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#supplyRecordDate").addClass("is-invalid");
@@ -121,6 +128,8 @@ function getAndValidateSupplyRecordValues() {
         cost: supplyCost,
         notes: supplyNotes,
         quantity: supplyQuantity,
-        files: uploadedFiles
+        files: uploadedFiles,
+        tags: supplyTags,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/taxrecord.js

@@ -91,7 +91,7 @@ function checkCustomMonthIntervalForTax() {
         Swal.fire({
             title: 'Specify Custom Month Interval',
             html: `
-                            <input type="text" id="inputCustomMileage" class="swal2-input" placeholder="Months">
+                            <input type="text" inputmode="numeric" id="inputCustomMileage" class="swal2-input" placeholder="Months">
                             `,
             confirmButtonText: 'Set',
             focusConfirm: false,
@@ -126,6 +126,10 @@ function getAndValidateTaxRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (taxDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#taxRecordDate").addClass("is-invalid");
@@ -157,6 +161,7 @@ function getAndValidateTaxRecordValues() {
         customMonthInterval: customMonthInterval,
         tags: taxTags,
         files: uploadedFiles,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }

wwwroot/js/upgraderecord.js

@@ -88,6 +88,10 @@ function getAndValidateUpgradeRecordValues() {
     var addReminderRecord = $("#addReminderCheck").is(":checked");
     //validation
     var hasError = false;
+    var extraFields = getAndValidateExtraFields();
+    if (extraFields.hasError) {
+        hasError = true;
+    }
     if (upgradeDate.trim() == '') { //eliminates whitespace.
         hasError = true;
         $("#upgradeRecordDate").addClass("is-invalid");
@@ -124,6 +128,7 @@ function getAndValidateUpgradeRecordValues() {
         files: uploadedFiles,
         supplies: selectedSupplies,
         tags: upgradeTags,
-        addReminderRecord: addReminderRecord
+        addReminderRecord: addReminderRecord,
+        extraFields: extraFields.extraFields
     }
 }