Merge pull request #305 from hargata/Hargata/user.provisioning

revert

.gitignore

@@ -8,3 +8,6 @@ wwwroot/documents/
 wwwroot/temp/
 wwwroot/imports/
 wwwroot/translations/
+config/userConfig.json
+CarCareTracker.csproj.user
+Properties/launchSettings.json

CarCareTracker.csproj

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

CarCareTracker.csproj.user

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <View_SelectedScaffolderID>RazorViewEmptyScaffolder</View_SelectedScaffolderID>
-    <View_SelectedScaffolderCategoryPath>root/Common/MVC/View</View_SelectedScaffolderCategoryPath>
-  </PropertyGroup>
-</Project>

Controllers/APIController.cs

@@ -29,6 +29,7 @@ namespace CarCareTracker.Controllers
         private readonly IUserLogic _userLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IMailHelper _mailHelper;
+        private readonly IConfigHelper _config;
         public APIController(IVehicleDataAccess dataAccess,
             IGasHelper gasHelper,
             IReminderHelper reminderHelper,
@@ -44,6 +45,7 @@ namespace CarCareTracker.Controllers
             IUserRecordDataAccess userRecordDataAccess,
             IMailHelper mailHelper,
             IFileHelper fileHelper,
+            IConfigHelper config,
             IUserLogic userLogic) 
         {
             _dataAccess = dataAccess;
@@ -62,6 +64,7 @@ namespace CarCareTracker.Controllers
             _reminderHelper = reminderHelper;
             _userLogic = userLogic;
             _fileHelper = fileHelper;
+            _config = config;
         }
         public IActionResult Index()
         {
@@ -126,6 +129,17 @@ namespace CarCareTracker.Controllers
                     Cost = decimal.Parse(input.Cost)
                 };
                 _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord);
+                if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
+                {
+                    var odometerRecord = new OdometerRecord()
+                    {
+                        VehicleId = vehicleId,
+                        Date = DateTime.Parse(input.Date),
+                        Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                        Mileage = int.Parse(input.Odometer)
+                    };
+                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                }
                 response.Success = true;
                 response.Message = "Service Record Added";
                 return Json(response);
@@ -182,6 +196,17 @@ namespace CarCareTracker.Controllers
                     Cost = decimal.Parse(input.Cost)
                 };
                 _collisionRecordDataAccess.SaveCollisionRecordToVehicle(repairRecord);
+                if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
+                {
+                    var odometerRecord = new OdometerRecord()
+                    {
+                        VehicleId = vehicleId,
+                        Date = DateTime.Parse(input.Date),
+                        Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                        Mileage = int.Parse(input.Odometer)
+                    };
+                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                }
                 response.Success = true;
                 response.Message = "Repair Record Added";
                 return Json(response);
@@ -238,6 +263,17 @@ namespace CarCareTracker.Controllers
                     Cost = decimal.Parse(input.Cost)
                 };
                 _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord);
+                if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
+                {
+                    var odometerRecord = new OdometerRecord()
+                    {
+                        VehicleId = vehicleId,
+                        Date = DateTime.Parse(input.Date),
+                        Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                        Mileage = int.Parse(input.Odometer)
+                    };
+                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                }
                 response.Success = true;
                 response.Message = "Upgrade Record Added";
                 return Json(response);
@@ -413,6 +449,17 @@ namespace CarCareTracker.Controllers
                     Cost = decimal.Parse(input.Cost)
                 };
                 _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord);
+                if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
+                {
+                    var odometerRecord = new OdometerRecord()
+                    {
+                        VehicleId = vehicleId,
+                        Date = DateTime.Parse(input.Date),
+                        Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
+                        Mileage = int.Parse(input.Odometer)
+                    };
+                    _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
+                }
                 response.Success = true;
                 response.Message = "Gas Record Added";
                 return Json(response);

Controllers/HomeController.cs

@@ -17,18 +17,26 @@ namespace CarCareTracker.Controllers
         private readonly IUserLogic _userLogic;
         private readonly IFileHelper _fileHelper;
         private readonly IConfigHelper _config;
-
+        private readonly IExtraFieldDataAccess _extraFieldDataAccess;
-        public HomeController(ILogger<HomeController> logger, 
+        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,70 @@ 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.");
+                                return View("OpenIDRegistration", model: userEmailAddress);
+                            }
+                        }
+                    }
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new RedirectResult("/Login");
+            }
+            return new RedirectResult("/Login");
+        }
         [HttpPost]
         public IActionResult Login(LoginModel credentials)
         {
@@ -81,6 +150,27 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [HttpPost]
+        public IActionResult RegisterOpenIdUser(LoginModel credentials)
+        {
+            var result = _loginLogic.RegisterOpenIdUser(credentials);
+            if (result.Success)
+            {
+                var userData = _loginLogic.ValidateOpenIDUser(new LoginModel() { EmailAddress = credentials.EmailAddress });
+                if (userData.Id != default)
+                {
+                    AuthCookie authCookie = new AuthCookie
+                    {
+                        UserData = userData,
+                        ExpiresOn = DateTime.Now.AddDays(1)
+                    };
+                    var serializedCookie = JsonSerializer.Serialize(authCookie);
+                    var encryptedCookie = _dataProtector.Protect(serializedCookie);
+                    Response.Cookies.Append("ACCESS_TOKEN", encryptedCookie, new CookieOptions { Expires = new DateTimeOffset(authCookie.ExpiresOn) });
+                }
+            }
+            return Json(result);
+        }
+        [HttpPost]
         public IActionResult RequestResetPassword(LoginModel credentials)
         {
             var result = _loginLogic.RequestResetPassword(credentials);

Controllers/MigrationController.cs

@@ -0,0 +1,757 @@
+using CarCareTracker.External.Implementations;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Npgsql;
+using System.Data.Common;
+using System.IO.Compression;
+using System.Xml.Linq;
+
+namespace CarCareTracker.Controllers
+{
+    [Authorize(Roles = nameof(UserData.IsRootUser))]
+    public class MigrationController : Controller
+    {
+        private IConfigHelper _configHelper;
+        private IFileHelper _fileHelper;
+        private readonly ILogger<MigrationController> _logger;
+        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, IConfiguration serverConfig, ILogger<MigrationController> logger)
+        {
+            _configHelper = configHelper;
+            _fileHelper = fileHelper;
+            _logger = logger;
+        }
+        public IActionResult Index()
+        {
+            if (!string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
+            {
+                return View();
+            } else
+            {
+                return new RedirectResult("/Error/Unauthorized");
+            }
+        }
+        private void InitializeTables(NpgsqlDataSource conn)
+        {
+            var cmds = new List<string>
+            {
+                "CREATE TABLE IF NOT EXISTS app.vehicles (id INT GENERATED BY DEFAULT AS IDENTITY primary key, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.collisionrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.upgraderecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.servicerecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.gasrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.notes (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.odometerrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.reminderrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.planrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.planrecordtemplates (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.supplyrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "CREATE TABLE IF NOT EXISTS app.taxrecords (id INT GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)",
+                "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.extrafields (id INT primary key, data jsonb not null)"
+            };
+            foreach(string cmd in cmds)
+            {
+                using (var ctext = conn.CreateCommand(cmd))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+        }
+        public IActionResult Export()
+        {
+            if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
+            {
+                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
+            }
+            var tempFolder = $"temp/{Guid.NewGuid()}";
+            var tempPath = $"{tempFolder}/cartracker.db";
+            var fullFolderPath = _fileHelper.GetFullFilePath(tempFolder, false);
+            Directory.CreateDirectory(fullFolderPath);
+            var fullFileName = _fileHelper.GetFullFilePath(tempPath, false);
+            try
+            {
+                var pgDataSource = NpgsqlDataSource.Create(_configHelper.GetServerPostgresConnection());
+                InitializeTables(pgDataSource);
+                //pull records
+                var vehicles = new List<Vehicle>();
+                var repairrecords = new List<CollisionRecord>();
+                var upgraderecords = new List<UpgradeRecord>();
+                var servicerecords = new List<ServiceRecord>();
+
+                var gasrecords = new List<GasRecord>();
+                var noterecords = new List<Note>();
+                var odometerrecords = new List<OdometerRecord>();
+                var reminderrecords = new List<ReminderRecord>();
+
+                var planrecords = new List<PlanRecord>();
+                var planrecordtemplates = new List<PlanRecordInput>();
+                var supplyrecords = new List<SupplyRecord>();
+                var taxrecords = new List<TaxRecord>();
+
+                var userrecords = new List<UserData>();
+                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))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            Vehicle vehicle = System.Text.Json.JsonSerializer.Deserialize<Vehicle>(reader["data"] as string);
+                            vehicles.Add(vehicle);
+                        }
+                }
+                foreach (var vehicle in vehicles)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<Vehicle>("vehicles");
+                        table.Upsert(vehicle);
+                    };
+                }
+                cmd = $"SELECT data FROM app.collisionrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            repairrecords.Add(System.Text.Json.JsonSerializer.Deserialize<CollisionRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in repairrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<CollisionRecord>("collisionrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.upgraderecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            upgraderecords.Add(System.Text.Json.JsonSerializer.Deserialize<UpgradeRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in upgraderecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<UpgradeRecord>("upgraderecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.servicerecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            servicerecords.Add(System.Text.Json.JsonSerializer.Deserialize<ServiceRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in servicerecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<ServiceRecord>("servicerecords");
+                        table.Upsert(record);
+                    };
+                }
+                #endregion
+                #region "Part2"
+                cmd = $"SELECT data FROM app.gasrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            gasrecords.Add(System.Text.Json.JsonSerializer.Deserialize<GasRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in gasrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<GasRecord>("gasrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.notes";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            noterecords.Add(System.Text.Json.JsonSerializer.Deserialize<Note>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in noterecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<Note>("notes");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.odometerrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            odometerrecords.Add(System.Text.Json.JsonSerializer.Deserialize<OdometerRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in odometerrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<OdometerRecord>("odometerrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.reminderrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            reminderrecords.Add(System.Text.Json.JsonSerializer.Deserialize<ReminderRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in reminderrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<ReminderRecord>("reminderrecords");
+                        table.Upsert(record);
+                    };
+                }
+                #endregion
+                #region "Part3"
+                cmd = $"SELECT data FROM app.planrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            planrecords.Add(System.Text.Json.JsonSerializer.Deserialize<PlanRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in planrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<PlanRecord>("planrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.planrecordtemplates";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            planrecordtemplates.Add(System.Text.Json.JsonSerializer.Deserialize<PlanRecordInput>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in planrecordtemplates)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<PlanRecordInput>("planrecordtemplates");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.supplyrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            supplyrecords.Add(System.Text.Json.JsonSerializer.Deserialize<SupplyRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in supplyrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<SupplyRecord>("supplyrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.taxrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            taxrecords.Add(System.Text.Json.JsonSerializer.Deserialize<TaxRecord>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in taxrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<TaxRecord>("taxrecords");
+                        table.Upsert(record);
+                    };
+                }
+                #endregion
+                #region "Part4"
+                cmd = $"SELECT id, username, emailaddress, password, isadmin FROM app.userrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UserData result = new UserData();
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.UserName = reader["username"].ToString();
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Password = reader["password"].ToString();
+                            result.IsAdmin = bool.Parse(reader["isadmin"].ToString());
+                            userrecords.Add(result);
+                        }
+                }
+                foreach (var record in userrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<UserData>("userrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT id, emailaddress, body FROM app.tokenrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            Token result = new Token();
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Body = reader["body"].ToString();
+                            tokenrecords.Add(result);
+                        }
+                }
+                foreach (var record in tokenrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<Token>("tokenrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT data FROM app.userconfigrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            userconfigrecords.Add(System.Text.Json.JsonSerializer.Deserialize<UserConfigData>(reader["data"] as string));
+                        }
+                }
+                foreach (var record in userconfigrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<UserConfigData>("userconfigrecords");
+                        table.Upsert(record);
+                    };
+                }
+                cmd = $"SELECT userId, vehicleId FROM app.useraccessrecords";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UserAccess result = new UserAccess()
+                            {
+                                Id = new UserVehicle
+                                {
+                                    UserId = int.Parse(reader["userId"].ToString()),
+                                    VehicleId = int.Parse(reader["vehicleId"].ToString())
+                                }
+                            };
+                            useraccessrecords.Add(result);
+                        }
+                }
+                foreach (var record in useraccessrecords)
+                {
+                    using (var db = new LiteDatabase(fullFileName))
+                    {
+                        var table = db.GetCollection<UserAccess>("useraccessrecords");
+                        table.Upsert(record);
+                    };
+                }
+                #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" });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+            }
+        }
+        public IActionResult Import(string fileName)
+        {
+            if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
+            {
+                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
+            }
+            var fullFileName = _fileHelper.GetFullFilePath(fileName);
+            if (string.IsNullOrWhiteSpace(fullFileName))
+            {
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+            }
+            try
+            {
+                var pgDataSource = NpgsqlDataSource.Create(_configHelper.GetServerPostgresConnection());
+                InitializeTables(pgDataSource);
+                //pull records
+                var vehicles = new List<Vehicle>();
+                var repairrecords = new List<CollisionRecord>();
+                var upgraderecords = new List<UpgradeRecord>();
+                var servicerecords = new List<ServiceRecord>();
+
+                var gasrecords = new List<GasRecord>();
+                var noterecords = new List<Note>();
+                var odometerrecords = new List<OdometerRecord>();
+                var reminderrecords = new List<ReminderRecord>();
+
+                var planrecords = new List<PlanRecord>();
+                var planrecordtemplates = new List<PlanRecordInput>();
+                var supplyrecords = new List<SupplyRecord>();
+                var taxrecords = new List<TaxRecord>();
+
+                var userrecords = new List<UserData>();
+                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))
+                {
+                    var table = db.GetCollection<Vehicle>("vehicles");
+                    vehicles = table.FindAll().ToList();
+                };
+                foreach(var vehicle in vehicles)
+                {
+                    string cmd = $"INSERT INTO app.vehicles (id, data) VALUES(@id, CAST(@data AS jsonb)); SELECT setval('app.vehicles_id_seq', (SELECT MAX(id) from app.vehicles));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", vehicle.Id);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(vehicle));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<CollisionRecord>("collisionrecords");
+                    repairrecords = table.FindAll().ToList();
+                };
+                foreach (var record in repairrecords)
+                {
+                    string cmd = $"INSERT INTO app.collisionrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.collisionrecords_id_seq', (SELECT MAX(id) from app.collisionrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<ServiceRecord>("servicerecords");
+                    servicerecords = table.FindAll().ToList();
+                };
+                foreach (var record in servicerecords)
+                {
+                    string cmd = $"INSERT INTO app.servicerecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.servicerecords_id_seq', (SELECT MAX(id) from app.servicerecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<UpgradeRecord>("upgraderecords");
+                    upgraderecords = table.FindAll().ToList();
+                };
+                foreach (var record in upgraderecords)
+                {
+                    string cmd = $"INSERT INTO app.upgraderecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.upgraderecords_id_seq', (SELECT MAX(id) from app.upgraderecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                #endregion
+                #region "Part2"
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<GasRecord>("gasrecords");
+                    gasrecords = table.FindAll().ToList();
+                };
+                foreach (var record in gasrecords)
+                {
+                    string cmd = $"INSERT INTO app.gasrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.gasrecords_id_seq', (SELECT MAX(id) from app.gasrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<Note>("notes");
+                    noterecords = table.FindAll().ToList();
+                };
+                foreach (var record in noterecords)
+                {
+                    string cmd = $"INSERT INTO app.notes (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.notes_id_seq', (SELECT MAX(id) from app.notes));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<OdometerRecord>("odometerrecords");
+                    odometerrecords = table.FindAll().ToList();
+                };
+                foreach (var record in odometerrecords)
+                {
+                    string cmd = $"INSERT INTO app.odometerrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.odometerrecords_id_seq', (SELECT MAX(id) from app.odometerrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<ReminderRecord>("reminderrecords");
+                    reminderrecords = table.FindAll().ToList();
+                };
+                foreach (var record in reminderrecords)
+                {
+                    string cmd = $"INSERT INTO app.reminderrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.reminderrecords_id_seq', (SELECT MAX(id) from app.reminderrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                #endregion
+                #region "Part3"
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<PlanRecord>("planrecords");
+                    planrecords = table.FindAll().ToList();
+                };
+                foreach (var record in planrecords)
+                {
+                    string cmd = $"INSERT INTO app.planrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.planrecords_id_seq', (SELECT MAX(id) from app.planrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<PlanRecordInput>("planrecordtemplates");
+                    planrecordtemplates = table.FindAll().ToList();
+                };
+                foreach (var record in planrecordtemplates)
+                {
+                    string cmd = $"INSERT INTO app.planrecordtemplates (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.planrecordtemplates_id_seq', (SELECT MAX(id) from app.planrecordtemplates));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<SupplyRecord>("supplyrecords");
+                    supplyrecords = table.FindAll().ToList();
+                };
+                foreach (var record in supplyrecords)
+                {
+                    string cmd = $"INSERT INTO app.supplyrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.supplyrecords_id_seq', (SELECT MAX(id) from app.supplyrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<TaxRecord>("taxrecords");
+                    taxrecords = table.FindAll().ToList();
+                };
+                foreach (var record in taxrecords)
+                {
+                    string cmd = $"INSERT INTO app.taxrecords (id, vehicleId, data) VALUES(@id, @vehicleId, CAST(@data AS jsonb)); SELECT setval('app.taxrecords_id_seq', (SELECT MAX(id) from app.taxrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
+                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                #endregion
+                #region "Part4"
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<UserData>("userrecords");
+                    userrecords =  table.FindAll().ToList();
+                };
+                foreach (var record in userrecords)
+                {
+                    string cmd = $"INSERT INTO app.userrecords (id, username, emailaddress, password, isadmin) VALUES(@id, @username, @emailaddress, @password, @isadmin); SELECT setval('app.userrecords_id_seq', (SELECT MAX(id) from app.userrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("username", record.UserName);
+                        ctext.Parameters.AddWithValue("emailaddress", record.EmailAddress);
+                        ctext.Parameters.AddWithValue("password", record.Password);
+                        ctext.Parameters.AddWithValue("isadmin", record.IsAdmin);
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<Token>("tokenrecords");
+                    tokenrecords = table.FindAll().ToList();
+                };
+                foreach (var record in tokenrecords)
+                {
+                    string cmd = $"INSERT INTO app.tokenrecords (id, emailaddress, body) VALUES(@id, @emailaddress, @body); SELECT setval('app.tokenrecords_id_seq', (SELECT MAX(id) from app.tokenrecords));";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", record.Id);
+                        ctext.Parameters.AddWithValue("emailaddress", record.EmailAddress);
+                        ctext.Parameters.AddWithValue("body", record.Body);
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<UserConfigData>("userconfigrecords");
+                    userconfigrecords = table.FindAll().ToList();
+                };
+                foreach (var record in userconfigrecords)
+                {
+                    string cmd = $"INSERT INTO app.userconfigrecords (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();
+                    }
+                }
+                using (var db = new LiteDatabase(fullFileName))
+                {
+                    var table = db.GetCollection<UserAccess>("useraccessrecords");
+                    useraccessrecords = table.FindAll().ToList();
+                };
+                foreach (var record in useraccessrecords)
+                {
+                    string cmd = $"INSERT INTO app.useraccessrecords (userId, vehicleId) VALUES(@userId, @vehicleId)";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("userId", record.Id.UserId);
+                        ctext.Parameters.AddWithValue("vehicleId", record.Id.VehicleId);
+                        ctext.ExecuteNonQuery();
+                    }
+                }
+                #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)
+            {
+                _logger.LogError(ex.Message);
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+            }
+        }
+    }
+}

Controllers/VehicleController.cs

@@ -27,6 +27,7 @@ namespace CarCareTracker.Controllers
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
         private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
         private readonly IPlanRecordDataAccess _planRecordDataAccess;
+        private readonly IPlanRecordTemplateDataAccess _planRecordTemplateDataAccess;
         private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
         private readonly IWebHostEnvironment _webEnv;
         private readonly IConfigHelper _config;
@@ -35,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,
@@ -51,7 +53,9 @@ namespace CarCareTracker.Controllers
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
             ISupplyRecordDataAccess supplyRecordDataAccess,
             IPlanRecordDataAccess planRecordDataAccess,
+            IPlanRecordTemplateDataAccess planRecordTemplateDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
+            IExtraFieldDataAccess extraFieldDataAccess,
             IUserLogic userLogic,
             IWebHostEnvironment webEnv,
             IConfigHelper config)
@@ -71,7 +75,9 @@ namespace CarCareTracker.Controllers
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
             _supplyRecordDataAccess = supplyRecordDataAccess;
             _planRecordDataAccess = planRecordDataAccess;
+            _planRecordTemplateDataAccess = planRecordTemplateDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
+            _extraFieldDataAccess = extraFieldDataAccess;
             _userLogic = userLogic;
             _webEnv = webEnv;
             _config = config;
@@ -142,6 +148,7 @@ namespace CarCareTracker.Controllers
                 _reminderRecordDataAccess.DeleteAllReminderRecordsByVehicleId(vehicleId) &&
                 _upgradeRecordDataAccess.DeleteAllUpgradeRecordsByVehicleId(vehicleId) &&
                 _planRecordDataAccess.DeleteAllPlanRecordsByVehicleId(vehicleId) &&
+                _planRecordTemplateDataAccess.DeleteAllPlanRecordTemplatesByVehicleId(vehicleId) &&
                 _supplyRecordDataAccess.DeleteAllSupplyRecordsByVehicleId(vehicleId) &&
                 _userLogic.DeleteAllAccessToVehicle(vehicleId) &&
                 _dataAccess.DeleteVehicle(vehicleId);
@@ -157,7 +164,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult ExportFromVehicleToCsv(int vehicleId, ImportMode mode)
         {
-            if (vehicleId == default)
+            if (vehicleId == default && mode != ImportMode.SupplyRecord)
             {
                 return Json(false);
             }
@@ -252,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))
                     {
@@ -345,7 +353,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult ImportToVehicleIdFromCsv(int vehicleId, ImportMode mode, string fileName)
         {
-            if (vehicleId == default || string.IsNullOrWhiteSpace(fileName))
+            if (vehicleId == default && mode != ImportMode.SupplyRecord)
+            {
+                return Json(false);
+            }
+            if (string.IsNullOrWhiteSpace(fileName))
             {
                 return Json(false);
             }
@@ -500,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);
                                 }
@@ -579,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)
@@ -597,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;
@@ -668,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)
@@ -685,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);
         }
@@ -738,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)
@@ -755,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);
         }
@@ -791,7 +807,14 @@ namespace CarCareTracker.Controllers
             {
                 foreach(TaxRecord recurringFee in recurringFees)
                 {
-                    var newDate = recurringFee.Date.AddMonths((int)recurringFee.RecurringInterval);
+                    var newDate = new DateTime();
+                    if (recurringFee.RecurringInterval != ReminderMonthInterval.Other)
+                    {
+                        newDate = recurringFee.Date.AddMonths((int)recurringFee.RecurringInterval);
+                    } else
+                    {
+                        newDate = recurringFee.Date.AddMonths(recurringFee.CustomMonthInterval);
+                    }
                     if (DateTime.Now > newDate){
                         recurringFee.IsRecurring = false;
                         var newRecurringFee = new TaxRecord()
@@ -803,8 +826,10 @@ namespace CarCareTracker.Controllers
                             IsRecurring = true,
                             Notes = recurringFee.Notes,
                             RecurringInterval = recurringFee.RecurringInterval,
+                            CustomMonthInterval = recurringFee.CustomMonthInterval,
                             Files = recurringFee.Files,
-                            Tags = recurringFee.Tags
+                            Tags = recurringFee.Tags,
+                            ExtraFields = recurringFee.ExtraFields
                         };
                         _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
                         _taxRecordDataAccess.SaveTaxRecordToVehicle(newRecurringFee);
@@ -823,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)
@@ -840,8 +865,10 @@ namespace CarCareTracker.Controllers
                 VehicleId = result.VehicleId,
                 IsRecurring = result.IsRecurring,
                 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);
         }
@@ -863,6 +890,7 @@ namespace CarCareTracker.Controllers
             var collisionRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
             var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
             var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+            var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
             var viewModel = new ReportViewModel();
             //get totalCostMakeUp
             viewModel.CostMakeUpForVehicle = new CostMakeUpForVehicle
@@ -880,10 +908,12 @@ namespace CarCareTracker.Controllers
             allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
             allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, 0));
             allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, 0));
+            allCosts.AddRange(_reportHelper.GetOdometerRecordSum(odometerRecords, 0));
             viewModel.CostForVehicleByMonth = allCosts.GroupBy(x => new { x.MonthName, x.MonthId }).OrderBy(x => x.Key.MonthId).Select(x => new CostForVehicleByMonth
             {
                 MonthName = x.Key.MonthName,
-                Cost = x.Sum(y => y.Cost)
+                Cost = x.Sum(y => y.Cost),
+                DistanceTraveled = x.Any(y=>y.MinMileage != default) ? x.Max(y=>y.MaxMileage) - x.Where(y=>y.MinMileage != default).Min(y=>y.MinMileage) : 0
             }).ToList();
             //get reminders
             var reminders = GetRemindersAndUrgency(vehicleId, DateTime.Now);
@@ -1212,10 +1242,16 @@ namespace CarCareTracker.Controllers
                 var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
                 allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, year));
             }
+            if (selectedMetrics.Contains(ImportMode.OdometerRecord))
+            {
+                var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetOdometerRecordSum(odometerRecords, year));
+            }
             var groupedRecord = allCosts.GroupBy(x => new { x.MonthName, x.MonthId }).OrderBy(x => x.Key.MonthId).Select(x => new CostForVehicleByMonth
             {
                 MonthName = x.Key.MonthName,
-                Cost = x.Sum(y => y.Cost)
+                Cost = x.Sum(y => y.Cost),
+                DistanceTraveled = x.Any(y => y.MinMileage != default) ? x.Max(y => y.MaxMileage) - x.Where(y => y.MinMileage != default).Min(y => y.MinMileage) : 0
             }).ToList();
             return PartialView("_GasCostByMonthReport", groupedRecord);
         }
@@ -1344,7 +1380,8 @@ namespace CarCareTracker.Controllers
                 IsRecurring = result.IsRecurring,
                 ReminderMileageInterval = result.ReminderMileageInterval,
                 ReminderMonthInterval = result.ReminderMonthInterval,
-                CustomMileageInterval = result.CustomMileageInterval
+                CustomMileageInterval = result.CustomMileageInterval,
+                CustomMonthInterval = result.CustomMonthInterval
             };
             return PartialView("_ReminderRecordModal", convertedResult);
         }
@@ -1397,7 +1434,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)
@@ -1414,7 +1451,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);
         }
@@ -1467,6 +1505,25 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Supply Records"
+        private List<string> CheckSupplyRecordsAvailability(List<SupplyUsage> supplyUsage)
+        {
+            //returns empty string if all supplies are available
+            var result = new List<string>();
+            foreach (SupplyUsage supply in supplyUsage)
+            {
+                //get supply record.
+                var supplyData = _supplyRecordDataAccess.GetSupplyRecordById(supply.SupplyId);
+                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}");
+                }
+            }
+            return result;
+        }
         private void RequisitionSupplyRecordsByUsage(List<SupplyUsage> supplyUsage)
         {
             foreach(SupplyUsage supply in supplyUsage)
@@ -1503,6 +1560,10 @@ namespace CarCareTracker.Controllers
         public IActionResult GetSupplyRecordsForRecordsByVehicleId(int vehicleId)
         {
             var result = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
+            if (_config.GetServerEnableShopSupplies())
+            {
+                result.AddRange(_supplyRecordDataAccess.GetSupplyRecordsByVehicleId(0)); // add shop supplies
+            }
             result.RemoveAll(x => x.Quantity <= 0);
             bool _useDescending = _config.GetUserConfig(User).UseDescending;
             if (_useDescending)
@@ -1526,7 +1587,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)
@@ -1544,7 +1605,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);
         }
@@ -1581,10 +1644,64 @@ namespace CarCareTracker.Controllers
             }
             return Json(result);
         }
+        [HttpPost]
+        public IActionResult SavePlanRecordTemplateToVehicleId(PlanRecordInput planRecord)
+        {
+            //check if template name already taken.
+            var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(planRecord.VehicleId).Where(x=>x.Description == planRecord.Description).Any();
+            if (existingRecord)
+            {
+                return Json(new OperationResponse {  Success = false, Message = "A template with that description already exists for this vehicle"});
+            }
+            planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            var result = _planRecordTemplateDataAccess.SavePlanRecordTemplateToVehicle(planRecord);
+            return Json(new OperationResponse { Success = result, Message = result ? "Template Added" : StaticHelper.GenericErrorMessage });
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetPlanRecordTemplatesForVehicleId(int vehicleId)
+        {
+            var result = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(vehicleId);
+            return PartialView("_PlanRecordTemplateModal", result);
+        }
+        [HttpPost]
+        public IActionResult DeletePlanRecordTemplateById(int planRecordTemplateId)
+        {
+            var result = _planRecordTemplateDataAccess.DeletePlanRecordTemplateById(planRecordTemplateId);
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult ConvertPlanRecordTemplateToPlanRecord(int planRecordTemplateId)
+        {
+            var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
+            if (existingRecord.Id == default)
+            {
+                return Json(new OperationResponse { Success = false, Message = "Unable to find template" });
+            }
+            if (existingRecord.Supplies.Any())
+            {
+                //check if all supplies are available
+                var supplyAvailability = CheckSupplyRecordsAvailability(existingRecord.Supplies);
+                if (supplyAvailability.Any())
+                {
+                    return Json(new OperationResponse { Success = false, Message = string.Join("<br>", supplyAvailability) });
+                }
+            }
+            //populate createdDate
+            existingRecord.DateCreated = DateTime.Now.ToString("G");
+            existingRecord.DateModified = DateTime.Now.ToString("G");
+            existingRecord.Id = default;
+            var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord.ToPlanRecord());
+            if (result && existingRecord.Supplies.Any())
+            {
+                RequisitionSupplyRecordsByUsage(existingRecord.Supplies);
+            }
+            return Json(new OperationResponse { Success = result, Message = result ? "Plan Record Added" : StaticHelper.GenericErrorMessage });
+        }
         [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)
@@ -1602,7 +1719,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.
@@ -1616,7 +1734,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);
                 }
@@ -1630,7 +1749,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);
                 }
@@ -1644,7 +1764,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);
                 }
@@ -1668,7 +1789,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);
         }
@@ -1707,7 +1829,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)
@@ -1722,7 +1844,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);
         }

Enum/ReminderMonthInterval.cs

@@ -2,6 +2,7 @@
 {
     public enum ReminderMonthInterval
     {
+        Other = 0,
         OneMonth = 1,
         ThreeMonths = 3,
         SixMonths = 6,

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/Litedb/PlanRecordTemplateDataAccess.cs

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

External/Implementations/Litedb/UserConfigDataAccess.cs

@@ -2,7 +2,6 @@
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace CarCareTracker.External.Implementations
 {

External/Implementations/Postgres/CollisionRecordDataAccess.cs

@@ -0,0 +1,160 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGCollisionRecordDataAccess : ICollisionRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGCollisionRecordDataAccess> _logger;
+        private static string tableName = "collisionrecords";
+        public PGCollisionRecordDataAccess(IConfiguration config, ILogger<PGCollisionRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<CollisionRecord> GetCollisionRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<CollisionRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            CollisionRecord collisionRecord = JsonSerializer.Deserialize<CollisionRecord>(reader["data"] as string);
+                            results.Add(collisionRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<CollisionRecord>();
+            }
+        }
+        public CollisionRecord GetCollisionRecordById(int collisionRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new CollisionRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", collisionRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            CollisionRecord collisionRecord = JsonSerializer.Deserialize<CollisionRecord>(reader["data"] as string);
+                            result = collisionRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new CollisionRecord();
+            }
+        }
+        public bool DeleteCollisionRecordById(int collisionRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", collisionRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveCollisionRecordToVehicle(CollisionRecord collisionRecord)
+        {
+            try
+            {
+                if (collisionRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", collisionRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        collisionRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (collisionRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(collisionRecord);
+                                ctextU.Parameters.AddWithValue("id", collisionRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return collisionRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(collisionRecord);
+                        ctext.Parameters.AddWithValue("id", collisionRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllCollisionRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

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/Implementations/Postgres/GasRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGGasRecordDataAccess: IGasRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGGasRecordDataAccess> _logger;
+        private static string tableName = "gasrecords";
+        public PGGasRecordDataAccess(IConfiguration config, ILogger<PGGasRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<GasRecord> GetGasRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<GasRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            GasRecord gasRecord = JsonSerializer.Deserialize<GasRecord>(reader["data"] as string);
+                            results.Add(gasRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<GasRecord>();
+            }
+        }
+        public GasRecord GetGasRecordById(int gasRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new GasRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", gasRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            GasRecord gasRecord = JsonSerializer.Deserialize<GasRecord>(reader["data"] as string);
+                            result = gasRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new GasRecord();
+            }
+        }
+        public bool DeleteGasRecordById(int gasRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", gasRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveGasRecordToVehicle(GasRecord gasRecord)
+        {
+            try
+            {
+                if (gasRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", gasRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        gasRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (gasRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(gasRecord);
+                                ctextU.Parameters.AddWithValue("id", gasRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return gasRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(gasRecord);
+                        ctext.Parameters.AddWithValue("id", gasRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllGasRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/NoteDataAccess.cs

@@ -0,0 +1,153 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGNoteDataAccess: INoteDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGNoteDataAccess> _logger;
+        private static string tableName = "notes";
+        public PGNoteDataAccess(IConfiguration config, ILogger<PGNoteDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<Note> GetNotesByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<Note>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            Note note = JsonSerializer.Deserialize<Note>(reader["data"] as string);
+                            results.Add(note);
+                        }
+                }
+                return results;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<Note>();
+            }
+        }
+        public Note GetNoteById(int noteId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new Note();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", noteId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            Note note = JsonSerializer.Deserialize<Note>(reader["data"] as string);
+                            result = note;
+                        }
+                }
+                return result;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new Note();
+            }
+        }
+        public bool SaveNoteToVehicle(Note note)
+        {
+            try
+            {
+                if (note.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", note.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        note.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (note.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(note);
+                                ctextU.Parameters.AddWithValue("id", note.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return note.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(note);
+                        ctext.Parameters.AddWithValue("id", note.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteNoteById(int noteId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", noteId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllNotesByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/OdometerRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGOdometerRecordDataAccess : IOdometerRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGOdometerRecordDataAccess> _logger;
+        private static string tableName = "odometerrecords";
+        public PGOdometerRecordDataAccess(IConfiguration config, ILogger<PGOdometerRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<OdometerRecord> GetOdometerRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<OdometerRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            OdometerRecord odometerRecord = JsonSerializer.Deserialize<OdometerRecord>(reader["data"] as string);
+                            results.Add(odometerRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<OdometerRecord>();
+            }
+        }
+        public OdometerRecord GetOdometerRecordById(int odometerRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new OdometerRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", odometerRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            OdometerRecord odometerRecord = JsonSerializer.Deserialize<OdometerRecord>(reader["data"] as string);
+                            result = odometerRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new OdometerRecord();
+            }
+        }
+        public bool DeleteOdometerRecordById(int odometerRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", odometerRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveOdometerRecordToVehicle(OdometerRecord odometerRecord)
+        {
+            try
+            {
+                if (odometerRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", odometerRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        odometerRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (odometerRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(odometerRecord);
+                                ctextU.Parameters.AddWithValue("id", odometerRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return odometerRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(odometerRecord);
+                        ctext.Parameters.AddWithValue("id", odometerRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllOdometerRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/PlanRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGPlanRecordDataAccess : IPlanRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGPlanRecordDataAccess> _logger;
+        private static string tableName = "planrecords";
+        public PGPlanRecordDataAccess(IConfiguration config, ILogger<PGPlanRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<PlanRecord> GetPlanRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<PlanRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            PlanRecord planRecord = JsonSerializer.Deserialize<PlanRecord>(reader["data"] as string);
+                            results.Add(planRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<PlanRecord>();
+            }
+        }
+        public PlanRecord GetPlanRecordById(int planRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new PlanRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", planRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            PlanRecord planRecord = JsonSerializer.Deserialize<PlanRecord>(reader["data"] as string);
+                            result = planRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new PlanRecord();
+            }
+        }
+        public bool DeletePlanRecordById(int planRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", planRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SavePlanRecordToVehicle(PlanRecord planRecord)
+        {
+            try
+            {
+                if (planRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", planRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        planRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (planRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(planRecord);
+                                ctextU.Parameters.AddWithValue("id", planRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return planRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(planRecord);
+                        ctext.Parameters.AddWithValue("id", planRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllPlanRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/PlanRecordTemplateDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGPlanRecordTemplateDataAccess : IPlanRecordTemplateDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGPlanRecordTemplateDataAccess> _logger;
+        private static string tableName = "planrecordtemplates";
+        public PGPlanRecordTemplateDataAccess(IConfiguration config, ILogger<PGPlanRecordTemplateDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<PlanRecordInput> GetPlanRecordTemplatesByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<PlanRecordInput>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            PlanRecordInput planRecord = JsonSerializer.Deserialize<PlanRecordInput>(reader["data"] as string);
+                            results.Add(planRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<PlanRecordInput>();
+            }
+        }
+        public PlanRecordInput GetPlanRecordTemplateById(int planRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new PlanRecordInput();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", planRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            PlanRecordInput planRecord = JsonSerializer.Deserialize<PlanRecordInput>(reader["data"] as string);
+                            result = planRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new PlanRecordInput();
+            }
+        }
+        public bool DeletePlanRecordTemplateById(int planRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", planRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SavePlanRecordTemplateToVehicle(PlanRecordInput planRecord)
+        {
+            try
+            {
+                if (planRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", planRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        planRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (planRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(planRecord);
+                                ctextU.Parameters.AddWithValue("id", planRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return planRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(planRecord);
+                        ctext.Parameters.AddWithValue("id", planRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllPlanRecordTemplatesByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/ReminderRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGReminderRecordDataAccess : IReminderRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGReminderRecordDataAccess> _logger;
+        private static string tableName = "reminderrecords";
+        public PGReminderRecordDataAccess(IConfiguration config, ILogger<PGReminderRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<ReminderRecord> GetReminderRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<ReminderRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            ReminderRecord reminderRecord = JsonSerializer.Deserialize<ReminderRecord>(reader["data"] as string);
+                            results.Add(reminderRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<ReminderRecord>();
+            }
+        }
+        public ReminderRecord GetReminderRecordById(int reminderRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new ReminderRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", reminderRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            ReminderRecord reminderRecord = JsonSerializer.Deserialize<ReminderRecord>(reader["data"] as string);
+                            result = reminderRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new ReminderRecord();
+            }
+        }
+        public bool DeleteReminderRecordById(int reminderRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", reminderRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveReminderRecordToVehicle(ReminderRecord reminderRecord)
+        {
+            try
+            {
+                if (reminderRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", reminderRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        reminderRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (reminderRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(reminderRecord);
+                                ctextU.Parameters.AddWithValue("id", reminderRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return reminderRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(reminderRecord);
+                        ctext.Parameters.AddWithValue("id", reminderRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllReminderRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/ServiceRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGServiceRecordDataAccess: IServiceRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGServiceRecordDataAccess> _logger;
+        private static string tableName = "servicerecords";
+        public PGServiceRecordDataAccess(IConfiguration config, ILogger<PGServiceRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<ServiceRecord> GetServiceRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<ServiceRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            ServiceRecord serviceRecord = JsonSerializer.Deserialize<ServiceRecord>(reader["data"] as string);
+                            results.Add(serviceRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<ServiceRecord>();
+            }
+        }
+        public ServiceRecord GetServiceRecordById(int serviceRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new ServiceRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", serviceRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            ServiceRecord serviceRecord = JsonSerializer.Deserialize<ServiceRecord>(reader["data"] as string);
+                            result = serviceRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new ServiceRecord();
+            }
+        }
+        public bool DeleteServiceRecordById(int serviceRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", serviceRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveServiceRecordToVehicle(ServiceRecord serviceRecord)
+        {
+            try
+            {
+                if (serviceRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", serviceRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        serviceRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (serviceRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(serviceRecord);
+                                ctextU.Parameters.AddWithValue("id", serviceRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return serviceRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(serviceRecord);
+                        ctext.Parameters.AddWithValue("id", serviceRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllServiceRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/SupplyRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGSupplyRecordDataAccess : ISupplyRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGSupplyRecordDataAccess> _logger;
+        private static string tableName = "supplyrecords";
+        public PGSupplyRecordDataAccess(IConfiguration config, ILogger<PGSupplyRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<SupplyRecord> GetSupplyRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<SupplyRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            SupplyRecord supplyRecord = JsonSerializer.Deserialize<SupplyRecord>(reader["data"] as string);
+                            results.Add(supplyRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<SupplyRecord>();
+            }
+        }
+        public SupplyRecord GetSupplyRecordById(int supplyRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new SupplyRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", supplyRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            SupplyRecord supplyRecord = JsonSerializer.Deserialize<SupplyRecord>(reader["data"] as string);
+                            result = supplyRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new SupplyRecord();
+            }
+        }
+        public bool DeleteSupplyRecordById(int supplyRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", supplyRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord)
+        {
+            try
+            {
+                if (supplyRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", supplyRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        supplyRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (supplyRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(supplyRecord);
+                                ctextU.Parameters.AddWithValue("id", supplyRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return supplyRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(supplyRecord);
+                        ctext.Parameters.AddWithValue("id", supplyRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllSupplyRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/TaxRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGTaxRecordDataAccess : ITaxRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGTaxRecordDataAccess> _logger;
+        private static string tableName = "taxrecords";
+        public PGTaxRecordDataAccess(IConfiguration config, ILogger<PGTaxRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<TaxRecord> GetTaxRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<TaxRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            TaxRecord taxRecord = JsonSerializer.Deserialize<TaxRecord>(reader["data"] as string);
+                            results.Add(taxRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<TaxRecord>();
+            }
+        }
+        public TaxRecord GetTaxRecordById(int taxRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new TaxRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", taxRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            TaxRecord taxRecord = JsonSerializer.Deserialize<TaxRecord>(reader["data"] as string);
+                            result = taxRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new TaxRecord();
+            }
+        }
+        public bool DeleteTaxRecordById(int taxRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", taxRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveTaxRecordToVehicle(TaxRecord taxRecord)
+        {
+            try
+            {
+                if (taxRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", taxRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        taxRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (taxRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(taxRecord);
+                                ctextU.Parameters.AddWithValue("id", taxRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return taxRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(taxRecord);
+                        ctext.Parameters.AddWithValue("id", taxRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllTaxRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/TokenRecordDataAccess.cs

@@ -0,0 +1,143 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGTokenRecordDataAccess : ITokenRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGTokenRecordDataAccess> _logger;
+        private static string tableName = "tokenrecords";
+        public PGTokenRecordDataAccess(IConfiguration config, ILogger<PGTokenRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, body TEXT not null, emailaddress TEXT not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<Token> GetTokens()
+        {
+            try
+            {
+                string cmd = $"SELECT id, emailaddress, body FROM app.{tableName}";
+                var results = new List<Token>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            Token result = new Token();
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Body = reader["body"].ToString();
+                            results.Add(result);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<Token>();
+            }
+        }
+        public Token GetTokenRecordByBody(string tokenBody)
+        {
+            try
+            {
+                string cmd = $"SELECT id, emailaddress, body FROM app.{tableName} WHERE body = @body";
+                var result = new Token();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("body", tokenBody);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Body = reader["body"].ToString();
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new Token();
+            }
+        }
+        public Token GetTokenRecordByEmailAddress(string emailAddress)
+        {
+            try
+            {
+                string cmd = $"SELECT id, emailaddress, body FROM app.{tableName} WHERE emailaddress = @emailaddress";
+                var result = new Token();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("emailaddress", emailAddress);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Body = reader["body"].ToString();
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new Token();
+            }
+        }
+        public bool CreateNewToken(Token token)
+        {
+            try
+            {
+                string cmd = $"INSERT INTO app.{tableName} (emailaddress, body) VALUES(@emailaddress, @body) RETURNING id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("emailaddress", token.EmailAddress);
+                    ctext.Parameters.AddWithValue("body", token.Body);
+                    token.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                    return token.Id != default;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteToken(int tokenId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", tokenId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/UpgradeRecordDataAccess.cs

@@ -0,0 +1,159 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGUpgradeRecordDataAccess : IUpgradeRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGUpgradeRecordDataAccess> _logger;
+        private static string tableName = "upgraderecords";
+        public PGUpgradeRecordDataAccess(IConfiguration config, ILogger<PGUpgradeRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, vehicleId INT not null, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<UpgradeRecord> GetUpgradeRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<UpgradeRecord>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UpgradeRecord upgradeRecord = JsonSerializer.Deserialize<UpgradeRecord>(reader["data"] as string);
+                            results.Add(upgradeRecord);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<UpgradeRecord>();
+            }
+        }
+        public UpgradeRecord GetUpgradeRecordById(int upgradeRecordId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                var result = new UpgradeRecord();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", upgradeRecordId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UpgradeRecord upgradeRecord = JsonSerializer.Deserialize<UpgradeRecord>(reader["data"] as string);
+                            result = upgradeRecord;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new UpgradeRecord();
+            }
+        }
+        public bool DeleteUpgradeRecordById(int upgradeRecordId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", upgradeRecordId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool SaveUpgradeRecordToVehicle(UpgradeRecord upgradeRecord)
+        {
+            try
+            {
+                if (upgradeRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (vehicleId, data) VALUES(@vehicleId, CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("vehicleId", upgradeRecord.VehicleId);
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        upgradeRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (upgradeRecord.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(upgradeRecord);
+                                ctextU.Parameters.AddWithValue("id", upgradeRecord.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return upgradeRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(upgradeRecord);
+                        ctext.Parameters.AddWithValue("id", upgradeRecord.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteAllUpgradeRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/UserAccessDataAcces.cs

@@ -0,0 +1,211 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Net.Mail;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGUserAccessDataAccess : IUserAccessDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGUserAccessDataAccess> _logger;
+        private static string tableName = "useraccessrecords";
+        public PGUserAccessDataAccess(IConfiguration config, ILogger<PGUserAccessDataAccess> logger)
+        {
+            pgDataSource = NpgsqlDataSource.Create(config["POSTGRES_CONNECTION"]);
+            _logger = logger;
+            try
+            {
+                //create table if not exist.
+                string initCMD = $"CREATE TABLE IF NOT EXISTS app.{tableName} (userId INT, vehicleId INT, PRIMARY KEY(userId, vehicleId))";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        /// <summary>
+        /// Gets a list of vehicles user have access to.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<UserAccess> GetUserAccessByUserId(int userId)
+        {
+            try
+            {
+                string cmd = $"SELECT userId, vehicleId FROM app.{tableName} WHERE userId = @userId";
+                var results = new List<UserAccess>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("userId", userId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UserAccess result = new UserAccess()
+                            {
+                                Id = new UserVehicle
+                                {
+                                    UserId = int.Parse(reader["userId"].ToString()),
+                                    VehicleId = int.Parse(reader["vehicleId"].ToString())
+                                }
+                            };
+                            results.Add(result);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<UserAccess>();
+            }
+        }
+        public UserAccess GetUserAccessByVehicleAndUserId(int userId, int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT userId, vehicleId FROM app.{tableName} WHERE userId = @userId AND vehicleId = @vehicleId";
+                UserAccess result = null;
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("userId", userId);
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            result = new UserAccess()
+                            {
+                                Id = new UserVehicle
+                                {
+                                    UserId = int.Parse(reader["userId"].ToString()),
+                                    VehicleId = int.Parse(reader["vehicleId"].ToString())
+                                }
+                            };
+                            return result;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new UserAccess();
+            }
+        }
+        public List<UserAccess> GetUserAccessByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT userId, vehicleId FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                var results = new List<UserAccess>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UserAccess result = new UserAccess()
+                            {
+                                Id = new UserVehicle
+                                {
+                                    UserId = int.Parse(reader["userId"].ToString()),
+                                    VehicleId = int.Parse(reader["vehicleId"].ToString())
+                                }
+                            };
+                            results.Add(result);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<UserAccess>();
+            }
+        }
+        public bool SaveUserAccess(UserAccess userAccess)
+        {
+            try
+            {
+                string cmd = $"INSERT INTO app.{tableName} (userId, vehicleId) VALUES(@userId, @vehicleId)";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("userId", userAccess.Id.UserId);
+                    ctext.Parameters.AddWithValue("vehicleId", userAccess.Id.VehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteUserAccess(int userId, int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE userId = @userId AND vehicleId = @vehicleId";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("userId", userId);
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        /// <summary>
+        /// Delete all access records when a vehicle is deleted.
+        /// </summary>
+        /// <param name="vehicleId"></param>
+        /// <returns></returns>
+        public bool DeleteAllAccessRecordsByVehicleId(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE vehicleId = @vehicleId";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("vehicleId", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        /// <summary>
+        /// Delee all access records when a user is deleted.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public bool DeleteAllAccessRecordsByUserId(int userId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE userId = @userId";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("userId", userId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/UserConfigDataAccess.cs

@@ -0,0 +1,107 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGUserConfigDataAccess: IUserConfigDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGUserConfigDataAccess> _logger;
+        private static string tableName = "userconfigrecords";
+        public PGUserConfigDataAccess(IConfiguration config, ILogger<PGUserConfigDataAccess> 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 UserConfigData GetUserConfig(int userId)
+        {
+            try
+            {
+                string cmd = $"SELECT data FROM app.{tableName} WHERE id = @id";
+                UserConfigData result = null;
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", userId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UserConfigData userConfig = JsonSerializer.Deserialize<UserConfigData>(reader["data"] as string);
+                            result = userConfig;
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new UserConfigData();
+            }
+        }
+        public bool SaveUserConfig(UserConfigData userConfigData)
+        {
+            var existingRecord = GetUserConfig(userConfigData.Id);
+            try
+            {
+                if (existingRecord == null)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (id, data) VALUES(@id, CAST(@data AS jsonb))";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(userConfigData);
+                        ctext.Parameters.AddWithValue("id", userConfigData.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(userConfigData);
+                        ctext.Parameters.AddWithValue("id", userConfigData.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteUserConfig(int userId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", userId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/UserRecordDataAccess.cs

@@ -0,0 +1,194 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGUserRecordDataAccess : IUserRecordDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGUserRecordDataAccess> _logger;
+        private static string tableName = "userrecords";
+        public PGUserRecordDataAccess(IConfiguration config, ILogger<PGUserRecordDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, username TEXT not null, emailaddress TEXT not null, password TEXT not null, isadmin BOOLEAN)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public List<UserData> GetUsers()
+        {
+            try
+            {
+                string cmd = $"SELECT id, username, emailaddress, password, isadmin FROM app.{tableName}";
+                var results = new List<UserData>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            UserData result = new UserData();
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.UserName = reader["username"].ToString();
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Password = reader["password"].ToString();
+                            result.IsAdmin = bool.Parse(reader["isadmin"].ToString());
+                            results.Add(result);
+                        }
+                }
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<UserData>();
+            }
+        }
+        public UserData GetUserRecordByUserName(string userName)
+        {
+            try
+            {
+                string cmd = $"SELECT id, username, emailaddress, password, isadmin FROM app.{tableName} WHERE username = @username";
+                var result = new UserData();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("username", userName);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.UserName = reader["username"].ToString();
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Password = reader["password"].ToString();
+                            result.IsAdmin = bool.Parse(reader["isadmin"].ToString());
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new UserData();
+            }
+        }
+        public UserData GetUserRecordByEmailAddress(string emailAddress)
+        {
+            try
+            {
+                string cmd = $"SELECT id, username, emailaddress, password, isadmin FROM app.{tableName} WHERE emailaddress = @emailaddress";
+                var result = new UserData();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("emailaddress", emailAddress);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.UserName = reader["username"].ToString();
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Password = reader["password"].ToString();
+                            result.IsAdmin = bool.Parse(reader["isadmin"].ToString());
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new UserData();
+            }
+        }
+        public UserData GetUserRecordById(int userId)
+        {
+            try
+            {
+                string cmd = $"SELECT id, username, emailaddress, password, isadmin FROM app.{tableName} WHERE id = @id";
+                var result = new UserData();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", userId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            result.Id = int.Parse(reader["id"].ToString());
+                            result.UserName = reader["username"].ToString();
+                            result.EmailAddress = reader["emailaddress"].ToString();
+                            result.Password = reader["password"].ToString();
+                            result.IsAdmin = bool.Parse(reader["isadmin"].ToString());
+                        }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new UserData();
+            }
+        }
+        public bool SaveUserRecord(UserData userRecord)
+        {
+            try
+            {
+                if (userRecord.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (username, emailaddress, password, isadmin) VALUES(@username, @emailaddress, @password, @isadmin) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("username", userRecord.UserName);
+                        ctext.Parameters.AddWithValue("emailaddress", userRecord.EmailAddress);
+                        ctext.Parameters.AddWithValue("password", userRecord.Password);
+                        ctext.Parameters.AddWithValue("isadmin", userRecord.IsAdmin);
+                        userRecord.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        return userRecord.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET username = @username, emailaddress = @emailaddress, password = @password, isadmin = @isadmin WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("id", userRecord.Id);
+                        ctext.Parameters.AddWithValue("username", userRecord.UserName);
+                        ctext.Parameters.AddWithValue("emailaddress", userRecord.EmailAddress);
+                        ctext.Parameters.AddWithValue("password", userRecord.Password);
+                        ctext.Parameters.AddWithValue("isadmin", userRecord.IsAdmin);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public bool DeleteUserRecord(int userId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", userId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+    }
+}

External/Implementations/Postgres/VehicleDataAccess.cs

@@ -0,0 +1,138 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Npgsql;
+using System.Text.Json;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class PGVehicleDataAccess: IVehicleDataAccess
+    {
+        private NpgsqlDataSource pgDataSource;
+        private readonly ILogger<PGVehicleDataAccess> _logger;
+        private static string tableName = "vehicles";
+        public PGVehicleDataAccess(IConfiguration config, ILogger<PGVehicleDataAccess> 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 GENERATED BY DEFAULT AS IDENTITY primary key, data jsonb not null)";
+                using (var ctext = pgDataSource.CreateCommand(initCMD))
+                {
+                    ctext.ExecuteNonQuery();
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+        }
+        public bool SaveVehicle(Vehicle vehicle)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(vehicle.ImageLocation))
+                {
+                    vehicle.ImageLocation = "/defaults/noimage.png";
+                }
+                if (vehicle.Id == default)
+                {
+                    string cmd = $"INSERT INTO app.{tableName} (data) VALUES(CAST(@data AS jsonb)) RETURNING id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        ctext.Parameters.AddWithValue("data", "{}");
+                        vehicle.Id = Convert.ToInt32(ctext.ExecuteScalar());
+                        //update json data
+                        if (vehicle.Id != default)
+                        {
+                            string cmdU = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                            using (var ctextU = pgDataSource.CreateCommand(cmdU))
+                            {
+                                var serializedData = JsonSerializer.Serialize(vehicle);
+                                ctextU.Parameters.AddWithValue("id", vehicle.Id);
+                                ctextU.Parameters.AddWithValue("data", serializedData);
+                                return ctextU.ExecuteNonQuery() > 0;
+                            }
+                        }
+                        return vehicle.Id != default;
+                    }
+                }
+                else
+                {
+                    string cmd = $"UPDATE app.{tableName} SET data = CAST(@data AS jsonb) WHERE id = @id";
+                    using (var ctext = pgDataSource.CreateCommand(cmd))
+                    {
+                        var serializedData = JsonSerializer.Serialize(vehicle);
+                        ctext.Parameters.AddWithValue("id", vehicle.Id);
+                        ctext.Parameters.AddWithValue("data", serializedData);
+                        return ctext.ExecuteNonQuery() > 0;
+                    }
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+            }
+            return false;
+        }
+        public bool DeleteVehicle(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"DELETE FROM app.{tableName} WHERE id = @id";
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    return ctext.ExecuteNonQuery() > 0;
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
+        public List<Vehicle> GetVehicles()
+        {
+            try
+            {
+                string cmd = $"SELECT id, data FROM app.{tableName} ORDER BY id ASC";
+                var results = new List<Vehicle>();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            Vehicle vehicle = JsonSerializer.Deserialize<Vehicle>(reader["data"] as string);
+                            results.Add(vehicle);
+                        }
+                }
+                return results;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new List<Vehicle>();
+            }
+        }
+        public Vehicle GetVehicleById(int vehicleId)
+        {
+            try
+            {
+                string cmd = $"SELECT id, data FROM app.{tableName} WHERE id = @id";
+                Vehicle vehicle = new Vehicle();
+                using (var ctext = pgDataSource.CreateCommand(cmd))
+                {
+                    ctext.Parameters.AddWithValue("id", vehicleId);
+                    using (NpgsqlDataReader reader = ctext.ExecuteReader())
+                        while (reader.Read())
+                        {
+                            vehicle = JsonSerializer.Deserialize<Vehicle>(reader["data"] as string);
+                        }
+                }
+                return vehicle;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return new Vehicle();
+            }
+        }
+    }
+}

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

External/Interfaces/IPlanRecordTemplateDataAccess.cs

@@ -0,0 +1,13 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IPlanRecordTemplateDataAccess
+    {
+        public List<PlanRecordInput> GetPlanRecordTemplatesByVehicleId(int vehicleId);
+        public PlanRecordInput GetPlanRecordTemplateById(int planRecordId);
+        public bool DeletePlanRecordTemplateById(int planRecordId);
+        public bool SavePlanRecordTemplateToVehicle(PlanRecordInput planRecord);
+        public bool DeleteAllPlanRecordTemplatesByVehicleId(int vehicleId);
+    }
+}

Filter/CollaboratorFilter.cs

@@ -1,4 +1,5 @@
-using CarCareTracker.Logic;
+using CarCareTracker.Helper;
+using CarCareTracker.Logic;
 using CarCareTracker.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -9,18 +10,36 @@ namespace CarCareTracker.Filter
     public class CollaboratorFilter: ActionFilterAttribute
     {
         private readonly IUserLogic _userLogic;
-        public CollaboratorFilter(IUserLogic userLogic) {
+        private readonly IConfigHelper _config;
+        public CollaboratorFilter(IUserLogic userLogic, IConfigHelper config) {
             _userLogic = userLogic;
+            _config = config;
         }
         public override void OnActionExecuting(ActionExecutingContext filterContext)
         {
             if (!filterContext.HttpContext.User.IsInRole(nameof(UserData.IsRootUser)))
             {
                 var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
-                var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                if (vehicleId != default)
-                if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
                 {
-                    filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                    if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
+                    {
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    }
+                } else
+                {
+                    var shopSupplyEndpoints = new List<string> { "ImportToVehicleIdFromCsv", "GetSupplyRecordsByVehicleId", "ExportFromVehicleToCsv" };
+                    if (shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()) && !_config.GetServerEnableShopSupplies())
+                    {
+                        //user trying to access shop supplies but shop supplies is not enabled by root user.
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    }
+                    else if (!shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()))
+                    {
+                        //user trying to access any other endpoints using 0 as vehicle id.
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    }
                 }
             }
         }

Helper/ConfigHelper.cs

@@ -7,10 +7,13 @@ namespace CarCareTracker.Helper
 {
     public interface IConfigHelper
     {
+        OpenIDConfig GetOpenIDConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         string GetLogoUrl();
         string GetServerLanguage();
+        bool GetServerEnableShopSupplies();
+        string GetServerPostgresConnection();
         public bool DeleteUserConfig(int userId);
     }
     public class ConfigHelper : IConfigHelper
@@ -26,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"];
@@ -40,6 +48,20 @@ namespace CarCareTracker.Helper
             var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
             return serverLanguage;
         }
+        public string GetServerPostgresConnection()
+        {
+            if (!string.IsNullOrWhiteSpace(_config["POSTGRES_CONNECTION"]))
+            {
+                return _config["POSTGRES_CONNECTION"];
+            } else
+            {
+                return string.Empty;
+            }
+        }
+        public bool GetServerEnableShopSupplies()
+        {
+            return bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)] ?? "false");
+        }
         public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
         {
             var storedUserId = user.FindFirstValue(ClaimTypes.NameIdentifier);
@@ -117,6 +139,7 @@ namespace CarCareTracker.Helper
                 PreferredGasMileageUnit = _config[nameof(UserConfig.PreferredGasMileageUnit)],
                 PreferredGasUnit = _config[nameof(UserConfig.PreferredGasUnit)],
                 UserLanguage = _config[nameof(UserConfig.UserLanguage)],
+                EnableShopSupplies = bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)]),
                 VisibleTabs = _config.GetSection("VisibleTabs").Get<List<ImportMode>>(),
                 DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
             };

Helper/MailHelper.cs

@@ -13,11 +13,14 @@ namespace CarCareTracker.Helper
     public class MailHelper : IMailHelper
     {
         private readonly MailConfig mailConfig;
+        private readonly IFileHelper _fileHelper;
         public MailHelper(
-            IConfiguration config
+            IConfiguration config,
+            IFileHelper fileHelper
             ) {
             //load mailConfig from Configuration
             mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
+            _fileHelper = fileHelper;
         }
         public OperationResponse NotifyUserForRegistration(string emailAddress, string token)
         {
@@ -75,14 +78,19 @@ namespace CarCareTracker.Helper
             {
                 return new OperationResponse { Success = false, Message = "No reminders could be found" };
             }
+            //get email template, this file has to exist since it's a static file.
+            var emailTemplatePath = _fileHelper.GetFullFilePath(StaticHelper.ReminderEmailTemplate);
             string emailSubject = $"Vehicle Reminders From LubeLogger - {DateTime.Now.ToShortDateString()}";
             //construct html table.
-            string emailBody = $"<h4>{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate}</h4><br /><table style='width:100%'><tr><th style='padding:8px;'>Urgency</th><th style='padding:8px;'>Description</th></tr>";
+            string emailBody = File.ReadAllText(emailTemplatePath);
+            emailBody = emailBody.Replace("{VehicleInformation}", $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate}");
+            string tableBody = "";
             foreach(ReminderRecordViewModel reminder in reminders)
             {
-                emailBody += $"<tr><td style='padding:8px; text-align:center;'>{reminder.Urgency}</td><td style='padding:8px; text-align:center;'>{reminder.Description}</td></tr>";
+                var dueOn = reminder.Metric == ReminderMetric.Both ? $"{reminder.Date} or {reminder.Mileage}" : reminder.Metric == ReminderMetric.Date ? $"{reminder.Date.ToShortDateString()}" : $"{reminder.Mileage}";
+                tableBody += $"<tr class='{reminder.Urgency}'><td>{StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency)}</td><td>{reminder.Description}</td><td>{dueOn}</td></tr>";
             }
-            emailBody += "</table>";
+            emailBody = emailBody.Replace("{TableBody}", tableBody);
             try
             {
                 foreach (string emailAddress in emailAddresses)

Helper/ReminderHelper.cs

@@ -13,7 +13,14 @@ namespace CarCareTracker.Helper
         {
             if (existingReminder.Metric == ReminderMetric.Both)
             {
-                existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other)
+                {
+                    existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                } else
+                {
+                    existingReminder.Date = existingReminder.Date.AddMonths(existingReminder.CustomMonthInterval);
+                }
+               
                 if (existingReminder.ReminderMileageInterval != ReminderMileageInterval.Other)
                 {
                     existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
@@ -35,7 +42,14 @@ namespace CarCareTracker.Helper
             }
             else if (existingReminder.Metric == ReminderMetric.Date)
             {
-                existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other)
+                {
+                    existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+                }
+                else
+                {
+                    existingReminder.Date = existingReminder.Date.AddMonths(existingReminder.CustomMonthInterval);
+                }
             }
             return existingReminder;
         }

Helper/ReportHelper.cs

@@ -5,6 +5,7 @@ namespace CarCareTracker.Helper
 {
     public interface IReportHelper
     {
+        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0);
         IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0);
         IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0);
         IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0);
@@ -13,6 +14,21 @@ namespace CarCareTracker.Helper
     }
     public class ReportHelper: IReportHelper
     {
+        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                odometerRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = 0,
+                MaxMileage = x.Max(y => y.Mileage),
+                MinMileage = x.Min(y => y.Mileage)
+            });
+        }
         public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
         {
             if (year != default)
@@ -23,7 +39,9 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
+                Cost = x.Sum(y => y.Cost),
+                MaxMileage = x.Max(y=>y.Mileage),
+                MinMileage = x.Min(y=>y.Mileage)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0)
@@ -36,7 +54,9 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
+                Cost = x.Sum(y => y.Cost),
+                MaxMileage = x.Max(y => y.Mileage),
+                MinMileage = x.Min(y => y.Mileage)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0)
@@ -49,7 +69,9 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
+                Cost = x.Sum(y => y.Cost),
+                MaxMileage = x.Max(y => y.Mileage),
+                MinMileage = x.Min(y => y.Mileage)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0)
@@ -62,7 +84,9 @@ namespace CarCareTracker.Helper
             {
                 MonthId = x.Key,
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
+                Cost = x.Sum(y => y.Cost),
+                MaxMileage = x.Max(y => y.Mileage),
+                MinMileage = x.Min(y => y.Mileage)
             });
         }
         public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0)

Helper/StaticHelper.cs

@@ -1,5 +1,6 @@
 using CarCareTracker.Models;
 using System.Globalization;
+using System.Linq;
 
 namespace CarCareTracker.Helper
 {
@@ -11,6 +12,22 @@ namespace CarCareTracker.Helper
         public static string DbName = "data/cartracker.db";
         public static string UserConfigPath = "config/userConfig.json";
         public static string GenericErrorMessage = "An error occurred, please try again later";
+        public static string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
+
+        public static string GetTitleCaseReminderUrgency(ReminderUrgency input)
+        {
+            switch (input)
+            {
+                case ReminderUrgency.NotUrgent:
+                    return "Not Urgent";
+                case ReminderUrgency.VeryUrgent:
+                    return "Very Urgent";
+                case ReminderUrgency.PastDue:
+                    return "Past Due";
+                default:
+                    return input.ToString();
+            }
+        }
 
         public static string TruncateStrings(string input, int maxLength = 25)
         {
@@ -112,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)
@@ -126,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)
@@ -140,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;
@@ -166,5 +210,9 @@ namespace CarCareTracker.Helper
             }
             return fuelEconomyUnit;
         }
+        public static long GetEpochFromDateTime(DateTime date)
+        {
+            return new DateTimeOffset(date).ToUnixTimeMilliseconds();
+        }
     }
 }

Logic/LoginLogic.cs

@@ -16,11 +16,13 @@ namespace CarCareTracker.Logic
         OperationResponse GenerateUserToken(string emailAddress, bool autoNotify);
         bool DeleteUserToken(int tokenId);
         bool DeleteUser(int userId);
+        OperationResponse RegisterOpenIdUser(LoginModel credentials);
         OperationResponse RegisterNewUser(LoginModel credentials);
         OperationResponse RequestResetPassword(LoginModel credentials);
         OperationResponse ResetPasswordByUser(LoginModel credentials);
         OperationResponse ResetUserPassword(LoginModel credentials);
         UserData ValidateUserCredentials(LoginModel credentials);
+        UserData ValidateOpenIDUser(LoginModel credentials);
         bool CheckIfUserIsValid(int userId);
         bool CreateRootUserCredentials(LoginModel credentials);
         bool DeleteRootUserCredentials();
@@ -59,6 +61,45 @@ namespace CarCareTracker.Logic
                 return result.Id != 0;
             }
         }
+        public OperationResponse RegisterOpenIdUser(LoginModel credentials)
+        {
+            //validate their token.
+            var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
+            if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
+            {
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
+            }
+            if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName))
+            {
+                return new OperationResponse { Success = false, Message = "Username cannot be blank" };
+            }
+            var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
+            if (existingUser.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "Username already taken" };
+            }
+            var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (existingUserWithEmail.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+            }
+            _tokenData.DeleteToken(existingToken.Id);
+            var newUser = new UserData()
+            {
+                UserName = credentials.UserName,
+                Password = GetHash(NewToken()), //generate a password for OpenID User
+                EmailAddress = credentials.EmailAddress
+            };
+            var result = _userData.SaveUserRecord(newUser);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "You will be logged in briefly." };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+            }
+        }
         //handles user registration
         public OperationResponse RegisterNewUser(LoginModel credentials)
         {
@@ -193,6 +234,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 +334,32 @@ namespace CarCareTracker.Logic
         #region "Root User"
         public bool CreateRootUserCredentials(LoginModel credentials)
         {
-            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+            //check if file exists
-            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+            if (File.Exists(StaticHelper.UserConfigPath))
-            if (existingUserConfig is not null)
             {
-                //create hashes of the login credentials.
+                var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
-                var hashedUserName = GetHash(credentials.UserName);
+                var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-                var hashedPassword = GetHash(credentials.Password);
+                if (existingUserConfig is not null)
-                //copy over settings that are off limits on the settings page.
+                {
-                existingUserConfig.EnableAuth = true;
+                    //create hashes of the login credentials.
-                existingUserConfig.UserNameHash = hashedUserName;
+                    var hashedUserName = GetHash(credentials.UserName);
-                existingUserConfig.UserPasswordHash = hashedPassword;
+                    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;
         }

Logic/UserLogic.cs

@@ -48,6 +48,12 @@ namespace CarCareTracker.Logic
             if (existingUser.Id != default)
             {
                 //user exists.
+                //check if user is already a collaborator
+                var userAccess = _userAccess.GetUserAccessByVehicleAndUserId(existingUser.Id, vehicleId);
+                if (userAccess != null)
+                {
+                    return new OperationResponse { Success = false, Message = "User is already a collaborator" };
+                }
                 var result = AddUserAccessToVehicle(existingUser.Id, vehicleId);
                 if (result)
                 {

Middleware/Authen.cs

@@ -176,7 +176,7 @@ namespace CarCareTracker.Middleware
                     return Task.CompletedTask;
                 }
             }
-            Response.Redirect("/Error/401");
+            Response.Redirect("/Error/Unauthorized");
             return Task.CompletedTask;
         }
     }

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

@@ -10,6 +10,7 @@
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
         public int CustomMileageInterval { get; set; } = 0;
+        public int CustomMonthInterval { get; set; } = 0;
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
         public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;

Models/Reminder/ReminderRecordInput.cs

@@ -10,20 +10,27 @@
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
         public int CustomMileageInterval { get; set; } = 0;
+        public int CustomMonthInterval { get; set; } = 0;
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
         public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
-        public ReminderRecord ToReminderRecord() { return new ReminderRecord { 
+        public ReminderRecord ToReminderRecord()
-            Id = Id, 
+        {
-            VehicleId = VehicleId, 
+            return new ReminderRecord
-            Date = DateTime.Parse(string.IsNullOrWhiteSpace(Date) ? DateTime.Now.AddDays(1).ToShortDateString() : Date), 
+            {
-            Mileage = Mileage, 
+                Id = Id,
-            Description = Description, 
+                VehicleId = VehicleId,
-            Metric = Metric,
+                Date = DateTime.Parse(string.IsNullOrWhiteSpace(Date) ? DateTime.Now.AddDays(1).ToShortDateString() : Date),
-            IsRecurring = IsRecurring,
+                Mileage = Mileage,
-            ReminderMileageInterval = ReminderMileageInterval,
+                Description = Description,
-            ReminderMonthInterval = ReminderMonthInterval,
+                Metric = Metric,
-            CustomMileageInterval = CustomMileageInterval,
+                IsRecurring = IsRecurring,
-            Notes = Notes }; }
+                ReminderMileageInterval = ReminderMileageInterval,
+                ReminderMonthInterval = ReminderMonthInterval,
+                CustomMileageInterval = CustomMileageInterval,
+                CustomMonthInterval = CustomMonthInterval,
+                Notes = Notes
+            };
+        }
     }
 }

Models/Report/CostForVehicleByMonth.cs

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

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

@@ -10,7 +10,9 @@
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
         public ReminderMonthInterval RecurringInterval { get; set; } = ReminderMonthInterval.OneYear;
+        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

@@ -10,8 +10,10 @@
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
         public ReminderMonthInterval RecurringInterval { get; set; } = ReminderMonthInterval.ThreeMonths;
+        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, 
@@ -21,8 +23,10 @@
             Notes = Notes, 
             IsRecurring = IsRecurring,
             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 }; }
     }
 }

Models/UserConfig.cs

@@ -13,6 +13,7 @@
         public bool UseMarkDownOnSavedNotes { get; set; }
         public bool EnableAutoReminderRefresh { get; set; }
         public bool EnableAutoOdometerInsert { get; set; }
+        public bool EnableShopSupplies { get; set; }
         public string PreferredGasUnit { get; set; } = string.Empty;
         public string PreferredGasMileageUnit { get; set; } = string.Empty;
         public string UserNameHash { get; set; }

Program.cs

@@ -12,21 +12,47 @@ var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
-builder.Services.AddSingleton<IVehicleDataAccess, VehicleDataAccess>();
+
-builder.Services.AddSingleton<INoteDataAccess, NoteDataAccess>();
+//data access method
-builder.Services.AddSingleton<IServiceRecordDataAccess, ServiceRecordDataAccess>();
+if (!string.IsNullOrWhiteSpace(builder.Configuration["POSTGRES_CONNECTION"])){
-builder.Services.AddSingleton<IGasRecordDataAccess, GasRecordDataAccess>();
+    builder.Services.AddSingleton<IVehicleDataAccess, PGVehicleDataAccess>();
-builder.Services.AddSingleton<ICollisionRecordDataAccess, CollisionRecordDataAccess>();
+    builder.Services.AddSingleton<INoteDataAccess, PGNoteDataAccess>();
-builder.Services.AddSingleton<ITaxRecordDataAccess, TaxRecordDataAccess>();
+    builder.Services.AddSingleton<IServiceRecordDataAccess, PGServiceRecordDataAccess>();
-builder.Services.AddSingleton<IReminderRecordDataAccess, ReminderRecordDataAccess>();
+    builder.Services.AddSingleton<IGasRecordDataAccess, PGGasRecordDataAccess>();
-builder.Services.AddSingleton<IUpgradeRecordDataAccess, UpgradeRecordDataAccess>();
+    builder.Services.AddSingleton<ICollisionRecordDataAccess, PGCollisionRecordDataAccess>();
-builder.Services.AddSingleton<IUserRecordDataAccess, UserRecordDataAccess>();
+    builder.Services.AddSingleton<ITaxRecordDataAccess, PGTaxRecordDataAccess>();
-builder.Services.AddSingleton<ITokenRecordDataAccess, TokenRecordDataAccess>();
+    builder.Services.AddSingleton<IReminderRecordDataAccess, PGReminderRecordDataAccess>();
-builder.Services.AddSingleton<IUserAccessDataAccess, UserAccessDataAccess>();
+    builder.Services.AddSingleton<IUpgradeRecordDataAccess, PGUpgradeRecordDataAccess>();
-builder.Services.AddSingleton<IUserConfigDataAccess, UserConfigDataAccess>();
+    builder.Services.AddSingleton<IOdometerRecordDataAccess, PGOdometerRecordDataAccess>();
-builder.Services.AddSingleton<ISupplyRecordDataAccess, SupplyRecordDataAccess>();
+    builder.Services.AddSingleton<ISupplyRecordDataAccess, PGSupplyRecordDataAccess>();
-builder.Services.AddSingleton<IPlanRecordDataAccess, PlanRecordDataAccess>();
+    builder.Services.AddSingleton<IPlanRecordDataAccess, PGPlanRecordDataAccess>();
-builder.Services.AddSingleton<IOdometerRecordDataAccess, OdometerRecordDataAccess>();
+    builder.Services.AddSingleton<IPlanRecordTemplateDataAccess, PGPlanRecordTemplateDataAccess>();
+    builder.Services.AddSingleton<IUserConfigDataAccess, PGUserConfigDataAccess>();
+    builder.Services.AddSingleton<IUserRecordDataAccess, PGUserRecordDataAccess>();
+    builder.Services.AddSingleton<ITokenRecordDataAccess, PGTokenRecordDataAccess>();
+    builder.Services.AddSingleton<IUserAccessDataAccess, PGUserAccessDataAccess>();
+    builder.Services.AddSingleton<IExtraFieldDataAccess, PGExtraFieldDataAccess>();
+}
+else
+{
+    builder.Services.AddSingleton<IVehicleDataAccess, VehicleDataAccess>();
+    builder.Services.AddSingleton<INoteDataAccess, NoteDataAccess>();
+    builder.Services.AddSingleton<IServiceRecordDataAccess, ServiceRecordDataAccess>();
+    builder.Services.AddSingleton<IGasRecordDataAccess, GasRecordDataAccess>();
+    builder.Services.AddSingleton<ICollisionRecordDataAccess, CollisionRecordDataAccess>();
+    builder.Services.AddSingleton<ITaxRecordDataAccess, TaxRecordDataAccess>();
+    builder.Services.AddSingleton<IReminderRecordDataAccess, ReminderRecordDataAccess>();
+    builder.Services.AddSingleton<IUpgradeRecordDataAccess, UpgradeRecordDataAccess>();
+    builder.Services.AddSingleton<IOdometerRecordDataAccess, OdometerRecordDataAccess>();
+    builder.Services.AddSingleton<ISupplyRecordDataAccess, SupplyRecordDataAccess>();
+    builder.Services.AddSingleton<IPlanRecordDataAccess, PlanRecordDataAccess>();
+    builder.Services.AddSingleton<IPlanRecordTemplateDataAccess, PlanRecordTemplateDataAccess>();
+    builder.Services.AddSingleton<IUserConfigDataAccess, UserConfigDataAccess>();
+    builder.Services.AddSingleton<IUserRecordDataAccess, UserRecordDataAccess>();
+    builder.Services.AddSingleton<ITokenRecordDataAccess, TokenRecordDataAccess>();
+    builder.Services.AddSingleton<IUserAccessDataAccess, UserAccessDataAccess>();
+    builder.Services.AddSingleton<IExtraFieldDataAccess, ExtraFieldDataAccess>();
+}
 
 //configure helpers
 builder.Services.AddSingleton<IFileHelper, FileHelper>();
@@ -45,6 +71,10 @@ if (!Directory.Exists("data"))
 {
     Directory.CreateDirectory("data");
 }
+if (!Directory.Exists("config"))
+{
+    Directory.CreateDirectory("config");
+}
 
 //Additional JsonFile
 builder.Configuration.AddJsonFile(StaticHelper.UserConfigPath, optional: true, reloadOnChange: true);

Properties/launchSettings.json

@@ -1,29 +0,0 @@
-{
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5011"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  },
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:11362",
-      "sslPort": 0
-    }
-  }
-}

Views/Home/Index.cshtml

@@ -13,12 +13,23 @@
 }
 @section Scripts {
     <script src="~/js/garage.js"></script>
+    <script src="~/js/supplyrecord.js"></script>
+    <script src="~/lib/drawdown/drawdown.js"></script>
 }
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
     <ul class="navbar-nav" id="homeTab" role="tablist">
         <li class="nav-item" role="presentation">
             <button class="nav-link user-select-none @(Model == "garage" ? "active" : "")" ontouchstart="detectLongTouch(this)" ontouchend="detectTouchEndPremature(this)" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-car-front me-2"></i>@translator.Translate(userLanguage,"Garage")</span></button>
         </li>
+        @if(config.GetServerEnableShopSupplies())
+        {
+            <li class="nav-item" role="presentation">
+                <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
+            </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>
@@ -50,6 +61,15 @@
         <li class="nav-item" role="presentation">
             <button class="nav-link @(Model == "garage" ? "active" : "")" oncontextmenu="sortGarage(this)" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><i class="bi bi-car-front me-2"></i>@translator.Translate(userLanguage,"Garage")</button>
         </li>
+        @if (config.GetServerEnableShopSupplies())
+        {
+            <li class="nav-item" role="presentation">
+                <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" 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>
@@ -77,6 +97,10 @@
 
             </div>
         </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>
@@ -88,6 +112,12 @@
         </div>
     </div>
 </div>
+<div class="modal fade" id="bulkImportModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content" id="bulkImportModalContent">
+        </div>
+    </div>
+</div>
 <script>
     loadGarage();
     bindWindowResize();

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

@@ -53,6 +53,10 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableAutoOdometerInsert" checked="@Model.UserConfig.EnableAutoOdometerInsert">
             <label class="form-check-label" for="enableAutoOdometerInsert">@translator.Translate(userLanguage, "Auto Insert Odometer Records")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Only when Adding Service/Repair/Upgrade/Fuel Record or Completing a Plan")</small></label>
         </div>
+        <div class="form-check form-switch @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
+            <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
+        </div>
         @if (User.IsInRole(nameof(UserData.IsRootUser)))
         {
             <div class="form-check form-switch">
@@ -153,7 +157,7 @@
                     <span class="lead">@translator.Translate(userLanguage, "Backups")</span>
                     <div class="row">
                         <div class="col-6 d-grid">
-                            <button onclick="makeBackup()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Make")</button>
+                            <button onclick="makeBackup()" class="btn btn-primary btn-md">@translator.Translate(userLanguage, "Create")</button>
                         </div>
                         <div class="col-6 d-grid">
                             <input onChange="restoreBackup(this)" type="file" accept=".zip" class="d-none" id="inputBackup">
@@ -174,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>
@@ -187,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.1</small>
+            <small class="text-body-secondary">Version 1.2.0</small>
         </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.
@@ -217,6 +231,7 @@
             <li class="list-group-item">Bootstrap</li>
             <li class="list-group-item">Bootstrap-DatePicker</li>
             <li class="list-group-item">LiteDB</li>
+            <li class="list-group-item">Npgsql</li>
             <li class="list-group-item">SweetAlert2</li>
             <li class="list-group-item">CsvHelper</li>
             <li class="list-group-item">Chart.js</li>
@@ -224,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;
@@ -256,6 +286,7 @@
             useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
             enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
             enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
+            enableShopSupplies: $("#enableShopSupplies").is(":checked"),
             preferredGasUnit: $("#preferredGasUnit").val(),
             preferredGasMileageUnit: $("#preferredFuelMileageUnit").val(),
             userLanguage: $("#defaultLanguage").val(),
@@ -277,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();
@@ -302,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.");
             }
@@ -345,9 +376,9 @@
             Swal.fire({
                 title: 'Setup Credentials',
                 html: `
-                        <input type="text" id="authUsername" class="swal2-input" placeholder="Username">
+                                    <input type="text" id="authUsername" class="swal2-input" placeholder="Username">
-                        <input type="password" id="authPassword" class="swal2-input" placeholder="Password">
+                                    <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/Login/OpenIDRegistration.cshtml

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

Views/Migration/Index.cshtml

@@ -0,0 +1,88 @@
+@using CarCareTracker.Helper
+@{
+    ViewData["Title"] = "Admin";
+}
+@inject IConfiguration config;
+@inject ITranslationHelper translator
+@{
+    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+}
+@model AdminViewModel
+<div class="container">
+    <div class="row">
+        <div class="col-1">
+            <a href="/Home" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></a>
+        </div>
+        <div class="col-11">
+            <span class="display-6">@translator.Translate(userLanguage, "Database Migration")</span>
+        </div>
+    </div>
+    <hr />
+    <div class="row">
+        <div class="col-12">
+            <ul class="list-group list-group-flush">
+                <li class="list-group-item">Instructions</li>
+                <li class="list-group-item">Use this tool to migrate data between LiteDB and Postgres</li>
+                <li class="list-group-item">Note that it is recommended that the Postgres DB is empty when importing from LiteDB to prevent primary key errors.</li>
+            </ul>
+        </div>
+    </div>
+    <hr />
+    <div class="row d-flex justify-content-center">
+        <div class="col-3">
+            <div class="d-grid">
+                <input onChange="importPostgresData(this)" type="file" accept=".db" class="d-none" id="inputImport">
+                <button type="button" class="btn btn-warning mt-2" onclick="importToPostgres()"><i class="bi bi-upload me-2"></i>@translator.Translate(userLanguage, "Import To Postgres")</button>
+            </div>
+            <div class="d-grid">
+                <button type="button" class="btn btn-warning mt-2" onclick="exportFromPostgres()"><i class="bi bi-download me-2"></i>@translator.Translate(userLanguage, "Export From Postgres")</button>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    function exportFromPostgres(){
+        sloader.show();
+        $.get('/Migration/Export', function (data) {
+            sloader.hide();
+            if (data.success) {
+                window.location.href = data.message;
+            } else {
+                errorToast(genericErrorMessage());
+            }
+        });
+    }
+    function importPostgresData(event) {
+        let formData = new FormData();
+        formData.append("file", event.files[0]);
+        sloader.show();
+        $.ajax({
+            url: "/Files/HandleFileUpload",
+            data: formData,
+            cache: false,
+            processData: false,
+            contentType: false,
+            type: 'POST',
+            success: function (response) {
+                if (response.trim() != '') {
+                    $.post('/Migration/Import', { fileName: response }, function (data) {
+                        sloader.hide();
+                        if (data.success) {
+                            successToast(data.message);
+                            setTimeout(function () { window.location.href = '/Home/Index' }, 500);
+                        } else {
+                            errorToast(genericErrorMessage());
+                        }
+                    });
+                }
+            },
+            error: function () {
+                sloader.hide();
+                errorToast("An error has occurred, please check the file size and try again later.");
+            }
+        });
+    }
+    function importToPostgres() {
+        $("#inputImport").click();
+    }
+</script>

Views/Shared/_Layout.cshtml

@@ -10,6 +10,7 @@
     var useMarkDown = userConfig.UseMarkDownOnSavedNotes;
     var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
     var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+    var firstDayOfWeek = (int)System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
     var numberFormat = System.Globalization.CultureInfo.CurrentCulture.NumberFormat;
     var userLanguage = userConfig.UserLanguage;
     shortDatePattern = shortDatePattern.ToLower();
@@ -58,7 +59,8 @@
                 useMarkDown: "@useMarkDown" == "True",
                 currencySymbol: decodeHTMLEntities("@numberFormat.CurrencySymbol"),
                 useThreeDecimals: "@useThreeDecimals" == "True",
-                useMPG: "@useMPG" == "True"
+                useMPG: "@useMPG" == "True",
+                firstDayOfWeek: @firstDayOfWeek
             }
         }
         function getShortDatePattern() {

Views/Vehicle/_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/_Gas.cshtml

@@ -101,9 +101,10 @@
             <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-2">@translator.Translate(userLanguage,"Date Refueled")</th>
-                    <th scope="col" class="col-2">@($"{translator.Translate(userLanguage,"Odometer")}({distanceUnit})")</th>
+                    <th scope="col" class="col-2">@($"{translator.Translate(userLanguage, "Odometer")}({distanceUnit})")</th>
+                    <th scope="col" class="col-1" style="cursor:pointer;" onclick="toggleSort('gas-tab-pane', this)">@($"Δ({distanceUnit})")</th>
                     <th scope="col" class="col-2" data-gas="consumption" data-unit="@consumptionUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{translator.Translate(userLanguage,"Consumption")}({consumptionUnit})")</th>
-                    <th scope="col" class="col-4" data-gas="fueleconomy" data-unit="@fuelEconomyUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{@translator.Translate(userLanguage,"Fuel Economy")}({fuelEconomyUnit})")</th>
+                    <th scope="col" class="col-3" data-gas="fueleconomy" data-unit="@fuelEconomyUnit" onclick="toggleSort('gas-tab-pane', this)" oncontextmenu="toggleUnits(this)" style="cursor:pointer;">@($"{@translator.Translate(userLanguage,"Fuel Economy")}({fuelEconomyUnit})")</th>
                     <th scope="col" class="col-1" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage,"Cost")</th>
                     <th scope="col" class="col-1" onclick="toggleSort('gas-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage,"Unit Cost")</th>
                 </tr>
@@ -113,9 +114,10 @@
                 {
                     <tr class="d-flex" style="cursor:pointer;" onclick="showEditGasRecordModal(@gasRecord.Id)" data-tags='@string.Join(" ", gasRecord.Tags)'>
                         <td class="col-2">@gasRecord.Date</td>
-                        <td class="col-2" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage">@gasRecord.Mileage</td>
+                        <td class="col-2" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@gasRecord.Mileage</td>
+                        <td class="col-1">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
                         <td class="col-2" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
-                        <td class="col-4" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
+                        <td class="col-3" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
                         <td class="col-1" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
                         <td class="col-1" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
                     </tr>

Views/Vehicle/_GasCostByMonthReport.cshtml

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

Views/Vehicle/_GasModal.cshtml

@@ -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>
@@ -82,7 +90,16 @@
     <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
     @if (isNew)
     {
-        <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle()">@translator.Translate(userLanguage, "Add New Plan Record")</button>
+        <div class="btn-group">
+            <button onclick="savePlanRecordToVehicle()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add New Plan Record")</button>
+            <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                <span class="visually-hidden">Toggle Dropdown</span>
+            </button>
+            <ul class="dropdown-menu">
+                <li><a class="dropdown-item" href="#" onclick="savePlanRecordTemplate()">@translator.Translate(userLanguage, "Save as Template")</a></li>
+                <li><a class="dropdown-item" href="#" onclick="showPlanRecordTemplatesModal()">@translator.Translate(userLanguage, "View Templates")</a></li>
+            </ul>
+        </div>
     }
     else if (!isNew)
     {

Views/Vehicle/_PlanRecordTemplateModal.cshtml

@@ -0,0 +1,87 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@model List<PlanRecordInput>
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage,"Select Template")</h5>
+    <button type="button" class="btn-close" onclick="hidePlanRecordTemplatesModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    @if (Model.Any())
+    {
+        <div class="row">
+            <div class="col-12" style="max-height:50vh; overflow-y:auto;">
+                <table class="table table-hover">
+                    <thead class="sticky-top">
+                        <tr class="d-flex">
+                            <th scope="col" class="col-8">@translator.Translate(userLanguage,"Description")</th>
+                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Use")</th>
+                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Delete")</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (PlanRecordInput planRecordTemplate in Model)
+                        {
+                            <tr class="d-flex" id="supplyRows">
+                                <td class="col-8 text-truncate">
+                                    @StaticHelper.TruncateStrings(planRecordTemplate.Description)
+                                    @if (planRecordTemplate.Files.Any())
+                                    {
+                                        <i class="bi bi-paperclip ms-2"></i>
+                                    }
+                                    @if (planRecordTemplate.Supplies.Any())
+                                    {
+                                        <i class="bi bi-shop ms-2"></i>
+                                    }
+                                    @if (planRecordTemplate.ImportMode == ImportMode.ServiceRecord)
+                                    {
+                                        <i class="bi bi-card-checklist ms-2"></i>
+                                    }
+                                    else if (planRecordTemplate.ImportMode == ImportMode.UpgradeRecord)
+                                    {
+                                        <i class="bi bi-wrench-adjustable ms-2"></i>
+                                    }
+                                    else if (planRecordTemplate.ImportMode == ImportMode.RepairRecord)
+                                    {
+                                        <i class="bi bi-exclamation-octagon ms-2"></i>
+                                    }
+                                    @if (planRecordTemplate.Priority == PlanPriority.Critical)
+                                    {
+                                        <i class="bi bi-fire ms-2"></i>
+                                    }
+                                    else if (planRecordTemplate.Priority == PlanPriority.Normal)
+                                    {
+                                        <i class="bi bi-water ms-2"></i>
+                                    }
+                                    else if (planRecordTemplate.Priority == PlanPriority.Low)
+                                    {
+                                        <i class="bi bi-snow ms-2"></i>
+                                    }
+                                </td>
+                                <td class="col-2"><button type="button" class="btn btn-primary" onclick="usePlannerRecordTemplate(@planRecordTemplate.Id)"><i class="bi bi-plus-square"></i></button></td>
+                                <td class="col-2"><button type="button" class="btn btn-danger" onclick="deletePlannerRecordTemplate(@planRecordTemplate.Id)"><i class="bi bi-trash"></i></button></td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    }
+    else
+    {
+        <div class="row">
+            <div class="col-12">
+                <div class="text-center">
+                    <h4>@translator.Translate(userLanguage, "No templates are found.")</h4>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hidePlanRecordTemplatesModal()">@translator.Translate(userLanguage, "Cancel")</button>
+</div>

Views/Vehicle/_PlanRecords.cshtml

@@ -100,4 +100,11 @@
         <div class="modal-content" id="planRecordModalContent">
         </div>
     </div>
+</div>
+
+<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="planRecordTemplateModalContent">
+        </div>
+    </div>
 </div>

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>
@@ -72,7 +72,9 @@
                         <!option value="OneHundredFiftyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredFiftyThousandMiles ? "selected" : "")>150000 mi. / Km</!option>
                     </select>
                     <label for="reminderRecurringMonth">Month</label>
-                    <select class="form-select" id="reminderRecurringMonth" @(Model.IsRecurring ? "" : "disabled")>
+                    <select class="form-select" onchange="checkCustomMonthInterval()" id="reminderRecurringMonth" @(Model.IsRecurring ? "" : "disabled")>
+                        <!option value="Other" @(Model.ReminderMonthInterval == ReminderMonthInterval.Other ? "selected" : "")>@(Model.ReminderMonthInterval == ReminderMonthInterval.Other && Model.CustomMonthInterval > 0 ? $"{translator.Translate(userLanguage, "Other")}: {Model.CustomMonthInterval}" : $"{translator.Translate(userLanguage, "Other")}") </!option>
+                        <!option value="OneMonth" @(Model.ReminderMonthInterval == ReminderMonthInterval.OneMonth ? "selected" : "")>@translator.Translate(userLanguage, "1 Month")</!option>
                         <!option value="ThreeMonths" @(Model.ReminderMonthInterval == ReminderMonthInterval.ThreeMonths || isNew ? "selected" : "")>@translator.Translate(userLanguage,"3 Months")</!option>
                         <!option value="SixMonths" @(Model.ReminderMonthInterval == ReminderMonthInterval.SixMonths ? "selected" : "")>@translator.Translate(userLanguage,"6 Months")</!option>
                         <!option value="OneYear" @(Model.ReminderMonthInterval == ReminderMonthInterval.OneYear ? "selected" : "")>@translator.Translate(userLanguage, "1 Year")</!option>
@@ -102,7 +104,8 @@
 </div>
 <script>
     var customMileageInterval = @Model.CustomMileageInterval;
+    var customMonthInterval = @Model.CustomMonthInterval;
     function getReminderRecordModelData() {
-        return { id: @Model.Id, mileageInterval: '@Model.ReminderMileageInterval.ToString()'}
+        return { id: @Model.Id, mileageInterval: decodeHTMLEntities('@Model.ReminderMileageInterval.ToString()'), monthInterval: decodeHTMLEntities('@Model.ReminderMonthInterval.ToString()')}
     }
 </script>

Views/Vehicle/_Report.cshtml

@@ -29,26 +29,49 @@
         <div class="col-md-6 col-12 mt-2">
             <div class="row">
                 <div class="col-md-1 d-sm-none d-md-block"></div>
-                <div class="col-12 col-md-10 reportsCheckBoxContainer">
+                <div class="col-12 col-md-10">
-                    <div class="form-check form-check-inline">
+                    <div class="dropdown d-grid">
-                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="serviceExpenseCheck" value="1" checked>
+                        <button class="btn btn-outline-warning dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                        <label class="form-check-label" for="serviceExpenseCheck">@translator.Translate(userLanguage,"Service")</label>
+                            Metrics
-                    </div>
+                        </button>
-                    <div class="form-check form-check-inline">
+                        <ul class="dropdown-menu">
-                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="repairExpenseCheck" value="2" checked>
+                            <li>
-                        <label class="form-check-label" for="repairExpenseCheck">@translator.Translate(userLanguage, "Repairs")</label>
+                                <div class="dropdown-item">
-                    </div>
+                                    <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="odometerExpenseCheck" value="6" checked>
-                    <div class="form-check form-check-inline">
+                                    <label class="form-check-label" for="odometerExpenseCheck">@translator.Translate(userLanguage, "Odometer")</label>
-                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="upgradeExpenseCheck" value="3" checked>
+                                </div>
-                        <label class="form-check-label" for="upgradeExpenseCheck">@translator.Translate(userLanguage, "Upgrades")</label>
+                            </li>
-                    </div>
+                            <li>
-                    <div class="form-check form-check-inline">
+                                <div class="dropdown-item">
-                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="gasExpenseCheck" value="4" checked>
+                                    <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="serviceExpenseCheck" value="1" checked>
-                        <label class="form-check-label" for="gasExpenseCheck">@translator.Translate(userLanguage, "Fuel")</label>
+                                    <label class="form-check-label" for="serviceExpenseCheck">@translator.Translate(userLanguage, "Service")</label>
-                    </div>
+                                </div>
-                    <div class="form-check form-check-inline">
+                            </li>
-                        <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="taxExpenseCheck" value="5" checked>
+                            <li>
-                        <label class="form-check-label" for="taxExpenseCheck">@translator.Translate(userLanguage, "Taxes")</label>
+                                <div class="dropdown-item">
+                                    <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="repairExpenseCheck" value="2" checked>
+                                    <label class="form-check-label" for="repairExpenseCheck">@translator.Translate(userLanguage, "Repairs")</label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="dropdown-item">
+                                    <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="upgradeExpenseCheck" value="3" checked>
+                                    <label class="form-check-label" for="upgradeExpenseCheck">@translator.Translate(userLanguage, "Upgrades")</label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="dropdown-item">
+                                    <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="gasExpenseCheck" value="4" checked>
+                                    <label class="form-check-label" for="gasExpenseCheck">@translator.Translate(userLanguage, "Fuel")</label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="dropdown-item">
+                                    <input class="form-check-input" onChange="updateCheck()" type="checkbox" id="taxExpenseCheck" value="5" checked>
+                                    <label class="form-check-label" for="taxExpenseCheck">@translator.Translate(userLanguage, "Taxes")</label>
+                                </div>
+                            </li>
+                        </ul>
                     </div>
                 </div>
                 <div class="col-md-1 d-sm-none d-md-block"></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>