Merge pull request #741 from hargata/Hargata/60

SimplyAuto Import

.gitignore

@@ -12,3 +12,4 @@ config/userConfig.json
 CarCareTracker.csproj.user
 Properties/launchSettings.json
 data/cartracker-log.db
+data/widgets.html

Controllers/APIController.cs

@@ -125,55 +125,7 @@ namespace CarCareTracker.Controllers
                 vehicles.AddRange(result);
             }
 
-            List<VehicleInfo> apiResult = new List<VehicleInfo>();
-
-            foreach(Vehicle vehicle in vehicles)
-            {
-                var currentMileage = _vehicleLogic.GetMaxMileage(vehicle.Id);
-                var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
-                var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
-
-                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicle.Id);
-                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicle.Id);
-                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicle.Id);
-                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicle.Id);
-                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicle.Id);
-                var planRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicle.Id);
-
-                var resultToAdd = new VehicleInfo()
-                {
-                    VehicleData = vehicle,
-                    LastReportedOdometer = currentMileage,
-                    ServiceRecordCount = serviceRecords.Count(),
-                    ServiceRecordCost = serviceRecords.Sum(x=>x.Cost),
-                    RepairRecordCount = repairRecords.Count(),
-                    RepairRecordCost = repairRecords.Sum(x=>x.Cost),
-                    UpgradeRecordCount = upgradeRecords.Count(),
-                    UpgradeRecordCost = upgradeRecords.Sum(x=>x.Cost),
-                    GasRecordCount = gasRecords.Count(),
-                    GasRecordCost = gasRecords.Sum(x=>x.Cost),
-                    TaxRecordCount = taxRecords.Count(),
-                    TaxRecordCost = taxRecords.Sum(x=> x.Cost),
-                    VeryUrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.VeryUrgent),
-                    PastDueReminderCount = results.Count(x => x.Urgency == ReminderUrgency.PastDue),
-                    UrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.Urgent),
-                    NotUrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.NotUrgent),
-                    PlanRecordBackLogCount = planRecords.Count(x=>x.Progress == PlanProgress.Backlog),
-                    PlanRecordInProgressCount = planRecords.Count(x=>x.Progress == PlanProgress.InProgress),
-                    PlanRecordTestingCount = planRecords.Count(x=>x.Progress == PlanProgress.Testing),
-                    PlanRecordDoneCount = planRecords.Count(x=>x.Progress == PlanProgress.Done)
-                };
-                //set next reminder
-                if (results.Any(x => (x.Metric == ReminderMetric.Date || x.Metric == ReminderMetric.Both) && x.Date >= DateTime.Now.Date))
-                {
-                    resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
-                }
-                else if (results.Any(x => (x.Metric == ReminderMetric.Odometer || x.Metric == ReminderMetric.Both) && x.Mileage >= currentMileage))
-                {
-                    resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
-                }
-                apiResult.Add(resultToAdd);
-            }
+            var apiResult = _vehicleLogic.GetVehicleInfo(vehicles);
             return Json(apiResult);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -198,9 +150,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -213,23 +163,18 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/servicerecords/add")]
         public IActionResult AddServiceRecord(int vehicleId, GenericRecordExportModel input)
         {
-            var response = new OperationResponse();
             if (vehicleId == default)
             {
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             if (string.IsNullOrWhiteSpace(input.Date) ||
                 string.IsNullOrWhiteSpace(input.Description) ||
                 string.IsNullOrWhiteSpace(input.Odometer) ||
                 string.IsNullOrWhiteSpace(input.Cost))
             {
-                response.Success = false;
-                response.Message = "Input object invalid, Date, Description, Odometer, and Cost cannot be empty.";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Input object invalid, Date, Description, Odometer, and Cost cannot be empty."));
             }
             try
             {
@@ -241,7 +186,8 @@ namespace CarCareTracker.Controllers
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     Cost = decimal.Parse(input.Cost),
-                    ExtraFields = input.ExtraFields
+                    ExtraFields = input.ExtraFields,
+                    Tags = string.IsNullOrWhiteSpace(input.Tags) ? new List<string>() : input.Tags.Split(' ').Distinct().ToList()
                 };
                 _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -256,16 +202,12 @@ namespace CarCareTracker.Controllers
                     _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Service Record via API - Description: {serviceRecord.Description}");
-                response.Success = true;
-                response.Message = "Service Record Added";
-                return Json(response);
+                return Json(OperationResponse.Succeed("Service Record Added"));
             }
             catch (Exception ex)
             {
-                response.Success = false;
-                response.Message = ex.Message;
                 Response.StatusCode = 500;
-                return Json(response);
+                return Json(OperationResponse.Failed(ex.Message));
             }
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -275,9 +217,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -290,23 +230,18 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/repairrecords/add")]
         public IActionResult AddRepairRecord(int vehicleId, GenericRecordExportModel input)
         {
-            var response = new OperationResponse();
             if (vehicleId == default)
             {
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             if (string.IsNullOrWhiteSpace(input.Date) ||
                 string.IsNullOrWhiteSpace(input.Description) ||
                 string.IsNullOrWhiteSpace(input.Odometer) ||
                 string.IsNullOrWhiteSpace(input.Cost))
             {
-                response.Success = false;
-                response.Message = "Input object invalid, Date, Description, Odometer, and Cost cannot be empty.";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Input object invalid, Date, Description, Odometer, and Cost cannot be empty."));
             }
             try
             {
@@ -318,7 +253,8 @@ namespace CarCareTracker.Controllers
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     Cost = decimal.Parse(input.Cost),
-                    ExtraFields = input.ExtraFields
+                    ExtraFields = input.ExtraFields,
+                    Tags = string.IsNullOrWhiteSpace(input.Tags) ? new List<string>() : input.Tags.Split(' ').Distinct().ToList()
                 };
                 _collisionRecordDataAccess.SaveCollisionRecordToVehicle(repairRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -333,16 +269,12 @@ namespace CarCareTracker.Controllers
                     _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Repair Record via API - Description: {repairRecord.Description}");
-                response.Success = true;
-                response.Message = "Repair Record Added";
-                return Json(response);
+                return Json(OperationResponse.Succeed("Repair Record Added"));
             }
             catch (Exception ex)
             {
-                response.Success = false;
-                response.Message = ex.Message;
                 Response.StatusCode = 500;
-                return Json(response);
+                return Json(OperationResponse.Failed(ex.Message));
             }
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -352,9 +284,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -367,23 +297,18 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/upgraderecords/add")]
         public IActionResult AddUpgradeRecord(int vehicleId, GenericRecordExportModel input)
         {
-            var response = new OperationResponse();
             if (vehicleId == default)
             {
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             if (string.IsNullOrWhiteSpace(input.Date) ||
                 string.IsNullOrWhiteSpace(input.Description) ||
                 string.IsNullOrWhiteSpace(input.Odometer) ||
                 string.IsNullOrWhiteSpace(input.Cost))
             {
-                response.Success = false;
-                response.Message = "Input object invalid, Date, Description, Odometer, and Cost cannot be empty.";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Input object invalid, Date, Description, Odometer, and Cost cannot be empty."));
             }
             try
             {
@@ -395,7 +320,8 @@ namespace CarCareTracker.Controllers
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     Cost = decimal.Parse(input.Cost),
-                    ExtraFields = input.ExtraFields
+                    ExtraFields = input.ExtraFields,
+                    Tags = string.IsNullOrWhiteSpace(input.Tags) ? new List<string>() : input.Tags.Split(' ').Distinct().ToList()
                 };
                 _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -410,16 +336,12 @@ namespace CarCareTracker.Controllers
                     _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Upgrade Record via API - Description: {upgradeRecord.Description}");
-                response.Success = true;
-                response.Message = "Upgrade Record Added";
-                return Json(response);
+                return Json(OperationResponse.Succeed("Upgrade Record Added"));
             }
             catch (Exception ex)
             {
-                response.Success = false;
-                response.Message = ex.Message;
                 Response.StatusCode = 500;
-                return Json(response);
+                return Json(OperationResponse.Failed(ex.Message));
             }
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -429,9 +351,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -443,22 +363,17 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/taxrecords/add")]
         public IActionResult AddTaxRecord(int vehicleId, TaxRecordExportModel input)
         {
-            var response = new OperationResponse();
             if (vehicleId == default)
             {
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             if (string.IsNullOrWhiteSpace(input.Date) ||
                 string.IsNullOrWhiteSpace(input.Description) ||
                 string.IsNullOrWhiteSpace(input.Cost))
             {
-                response.Success = false;
-                response.Message = "Input object invalid, Date, Description, and Cost cannot be empty.";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Input object invalid, Date, Description, and Cost cannot be empty."));
             }
             try
             {
@@ -469,20 +384,17 @@ namespace CarCareTracker.Controllers
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     Cost = decimal.Parse(input.Cost),
-                    ExtraFields = input.ExtraFields
+                    ExtraFields = input.ExtraFields,
+                    Tags = string.IsNullOrWhiteSpace(input.Tags) ? new List<string>() : input.Tags.Split(' ').Distinct().ToList()
                 };
                 _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord);
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Tax Record via API - Description: {taxRecord.Description}");
-                response.Success = true;
-                response.Message = "Tax Record Added";
-                return Json(response);
+                return Json(OperationResponse.Succeed("Tax Record Added"));
             }
             catch (Exception ex)
             {
-                response.Success = false;
-                response.Message = ex.Message;
                 Response.StatusCode = 500;
-                return Json(response);
+                return Json(OperationResponse.Failed(ex.Message));
             }
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -492,9 +404,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -508,9 +418,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -528,21 +436,16 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/odometerrecords/add")]
         public IActionResult AddOdometerRecord(int vehicleId, OdometerRecordExportModel input)
         {
-            var response = new OperationResponse();
             if (vehicleId == default)
             {
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             if (string.IsNullOrWhiteSpace(input.Date) ||
                 string.IsNullOrWhiteSpace(input.Odometer))
             {
-                response.Success = false;
-                response.Message = "Input object invalid, Date and Odometer cannot be empty.";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Input object invalid, Date and Odometer cannot be empty."));
             }
             try
             {
@@ -553,19 +456,16 @@ namespace CarCareTracker.Controllers
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     InitialMileage = (string.IsNullOrWhiteSpace(input.InitialOdometer) || int.Parse(input.InitialOdometer) == default) ? _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List<OdometerRecord>()) : int.Parse(input.InitialOdometer),
                     Mileage = int.Parse(input.Odometer),
-                    ExtraFields = input.ExtraFields
+                    ExtraFields = input.ExtraFields,
+                    Tags = string.IsNullOrWhiteSpace(input.Tags) ? new List<string>() : input.Tags.Split(' ').Distinct().ToList()
                 };
                 _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Odometer Record via API - Mileage: {odometerRecord.Mileage.ToString()}");
-                response.Success = true;
-                response.Message = "Odometer Record Added";
-                return Json(response);
+                return Json(OperationResponse.Succeed("Odometer Record Added"));
             } catch (Exception ex)
             {
-                response.Success = false;
-                response.Message = ex.Message;
                 Response.StatusCode = 500;
-                return Json(response);
+                return Json(OperationResponse.Failed(ex.Message));
             }
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -575,9 +475,7 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
+                var response = OperationResponse.Failed("Must provide a valid vehicle id");
                 Response.StatusCode = 400;
                 return Json(response);
             }
@@ -601,13 +499,10 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/gasrecords/add")]
         public IActionResult AddGasRecord(int vehicleId, GasRecordExportModel input)
         {
-            var response = new OperationResponse();
             if (vehicleId == default)
             {
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             if (string.IsNullOrWhiteSpace(input.Date) ||
                 string.IsNullOrWhiteSpace(input.Odometer) ||
@@ -617,10 +512,8 @@ namespace CarCareTracker.Controllers
                 string.IsNullOrWhiteSpace(input.MissedFuelUp)
                 )
             {
-                response.Success = false;
-                response.Message = "Input object invalid, Date, Odometer, FuelConsumed, IsFillToFull, MissedFuelUp, and Cost cannot be empty.";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Input object invalid, Date, Odometer, FuelConsumed, IsFillToFull, MissedFuelUp, and Cost cannot be empty."));
             }
             try
             {
@@ -634,7 +527,8 @@ namespace CarCareTracker.Controllers
                     MissedFuelUp = bool.Parse(input.MissedFuelUp),
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     Cost = decimal.Parse(input.Cost),
-                    ExtraFields = input.ExtraFields
+                    ExtraFields = input.ExtraFields,
+                    Tags = string.IsNullOrWhiteSpace(input.Tags) ? new List<string>() : input.Tags.Split(' ').Distinct().ToList()
                 };
                 _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -649,16 +543,12 @@ namespace CarCareTracker.Controllers
                     _odometerLogic.AutoInsertOdometerRecord(odometerRecord);
                 }
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Gas record via API - Mileage: {gasRecord.Mileage.ToString()}");
-                response.Success = true;
-                response.Message = "Gas Record Added";
-                return Json(response);
+                return Json(OperationResponse.Succeed("Gas Record Added"));
             }
             catch (Exception ex)
             {
-                response.Success = false;
-                response.Message = ex.Message;
                 Response.StatusCode = 500;
-                return Json(response);
+                return Json(OperationResponse.Failed(ex.Message));
             }
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -668,11 +558,8 @@ namespace CarCareTracker.Controllers
         {
             if (vehicleId == default)
             {
-                var response = new OperationResponse();
-                response.Success = false;
-                response.Message = "Must provide a valid vehicle id";
                 Response.StatusCode = 400;
-                return Json(response);
+                return Json(OperationResponse.Failed("Must provide a valid vehicle id"));
             }
             var currentMileage = _vehicleLogic.GetMaxMileage(vehicleId);
             var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
@@ -720,17 +607,17 @@ namespace CarCareTracker.Controllers
             }
             if (!operationResponses.Any())
             {
-                return Json(new OperationResponse { Success = false, Message = "No Emails Sent, No Vehicles Available or No Recipients Configured" });
+                return Json(OperationResponse.Failed("No Emails Sent, No Vehicles Available or No Recipients Configured"));
             }
             else if (operationResponses.All(x => x.Success))
             {
-                return Json(new OperationResponse { Success = true, Message = $"Emails Sent({operationResponses.Count()})" });
+                return Json(OperationResponse.Succeed($"Emails Sent({operationResponses.Count()})"));
             } else if (operationResponses.All(x => !x.Success))
             {
-                return Json(new OperationResponse { Success = false, Message = $"All Emails Failed({operationResponses.Count()}), Check SMTP Settings" });
+                return Json(OperationResponse.Failed($"All Emails Failed({operationResponses.Count()}), Check SMTP Settings"));
             } else
             {
-                return Json(new OperationResponse { Success = true, Message = $"Emails Sent({operationResponses.Count(x => x.Success)}), Emails Failed({operationResponses.Count(x => !x.Success)}), Check Recipient Settings" });
+                return Json(OperationResponse.Succeed($"Emails Sent({operationResponses.Count(x => x.Success)}), Emails Failed({operationResponses.Count(x => !x.Success)}), Check Recipient Settings"));
             }
         }
         [Authorize(Roles = nameof(UserData.IsRootUser))]

Controllers/AdminController.cs

@@ -55,7 +55,7 @@ namespace CarCareTracker.Controllers
                         }
                     }
                 }
-                var successResponse = new OperationResponse { Success = true, Message = "Token Generated!" };
+                var successResponse = OperationResponse.Succeed("Token Generated!");
                 return Json(successResponse);
             } else
             {

Controllers/FilesController.cs

@@ -32,7 +32,7 @@ namespace CarCareTracker.Controllers
             var originalFileName = Path.GetFileNameWithoutExtension(file.FileName);
             if (originalFileName == "en_US")
             {
-                return Json(new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." });
+                return Json(OperationResponse.Failed("The translation file name en_US is reserved."));
             }
             var fileName = UploadFile(file);
             //move file from temp to translation folder.
@@ -41,9 +41,9 @@ namespace CarCareTracker.Controllers
             if (!string.IsNullOrWhiteSpace(uploadedFilePath))
             {
                 var result = _fileHelper.RenameFile(uploadedFilePath, originalFileName);
-                return Json(new OperationResponse { Success = result, Message = string.Empty });
+                return Json(OperationResponse.Conditional(result));
             }
-            return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+            return Json(OperationResponse.Failed());
         }
 
         [HttpPost]

Controllers/HomeController.cs

@@ -55,6 +55,59 @@ namespace CarCareTracker.Controllers
         {
             return View(model: tab);
         }
+        [Route("/kiosk")]
+        public IActionResult Kiosk(string exclusions, KioskMode kioskMode = KioskMode.Vehicle)
+        { 
+            try {
+                var viewModel = new KioskViewModel
+                {
+                    Exclusions = string.IsNullOrWhiteSpace(exclusions) ? new List<int>() : exclusions.Split(',').Select(x => int.Parse(x)).ToList(),
+                    KioskMode = kioskMode
+                };
+                return View(viewModel);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return View(new KioskViewModel());
+            }
+        }
+        [HttpPost]
+        public IActionResult KioskContent(KioskViewModel kioskParameters)
+        {
+            var vehiclesStored = _dataAccess.GetVehicles();
+            if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
+            }
+            vehiclesStored.RemoveAll(x => kioskParameters.Exclusions.Contains(x.Id));
+            var userConfig = _config.GetUserConfig(User);
+            if (userConfig.HideSoldVehicles)
+            {
+                vehiclesStored.RemoveAll(x => !string.IsNullOrWhiteSpace(x.SoldDate));
+            }
+            switch (kioskParameters.KioskMode)
+            {
+                case KioskMode.Vehicle:
+                    {
+                        var kioskResult = _vehicleLogic.GetVehicleInfo(vehiclesStored);
+                        return PartialView("_Kiosk", kioskResult);
+                    }
+                case KioskMode.Plan:
+                    {
+                        var kioskResult = _vehicleLogic.GetPlans(vehiclesStored, true);
+                        return PartialView("_KioskPlan", kioskResult);
+                    }
+                    break;
+                case KioskMode.Reminder:
+                    {
+                        var kioskResult = _vehicleLogic.GetReminders(vehiclesStored, false);
+                        return PartialView("_KioskReminder", kioskResult);
+                    }
+            }
+            var result = _vehicleLogic.GetVehicleInfo(vehiclesStored);
+            return PartialView("_Kiosk", result);
+        }
         public IActionResult Garage()
         {
             var vehiclesStored = _dataAccess.GetVehicles();
@@ -118,19 +171,7 @@ namespace CarCareTracker.Controllers
             {
                 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 reminderUrgency = _reminderHelper.GetReminderRecordViewModels(vehicleReminders, 0, DateTime.Now);
-                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Id = x.Id, Date = x.Date, Urgency = x.Urgency, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" }).ToList();
-                    reminders.AddRange(reminderUrgency);
-                }
-            }
+            var reminders = _vehicleLogic.GetReminders(vehiclesStored, true);
             return PartialView("_Calendar", reminders);
         }
         public IActionResult ViewCalendarReminder(int reminderId)
@@ -184,10 +225,6 @@ namespace CarCareTracker.Controllers
             var result = _config.SaveUserConfig(User, existingConfig);
             return Json(result);
         }
-        public IActionResult Privacy()
-        {
-            return View();
-        }
         [Authorize(Roles = nameof(UserData.IsRootUser))]
         public IActionResult GetExtraFieldsModal(int importMode = 0)
         {
@@ -243,12 +280,12 @@ namespace CarCareTracker.Controllers
                     var result = _loginLogic.UpdateUserDetails(userId, userAccount);
                     return Json(result);
                 }
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         [HttpGet]
@@ -456,18 +493,69 @@ namespace CarCareTracker.Controllers
                 }
                 if (translationsDownloaded > 0)
                 {
-                    return Json(new OperationResponse() { Success = true, Message = $"{translationsDownloaded} Translations Downloaded" });
+                    return Json(OperationResponse.Succeed($"{translationsDownloaded} Translations Downloaded"));
                 } else
                 {
-                    return Json(new OperationResponse() { Success = false, Message = "No Translations Downloaded" });
+                    return Json(OperationResponse.Failed("No Translations Downloaded"));
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogError($"Unable to retrieve translations: {ex.Message}");
-                return Json(new OperationResponse() { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
+        public ActionResult GetVehicleSelector(int vehicleId)
+        {
+            var vehiclesStored = _dataAccess.GetVehicles();
+            if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
+            }
+            if (vehicleId != default)
+            {
+                vehiclesStored.RemoveAll(x => x.Id == vehicleId);
+            }
+            var userConfig = _config.GetUserConfig(User);
+            if (userConfig.HideSoldVehicles)
+            {
+                vehiclesStored.RemoveAll(x => !string.IsNullOrWhiteSpace(x.SoldDate));
+            }
+            return PartialView("_VehicleSelector", vehiclesStored);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
+        public IActionResult GetCustomWidgetEditor()
+        {
+            if (_config.GetCustomWidgetsEnabled())
+            {
+                var customWidgetData = _fileHelper.GetWidgets();
+                return PartialView("_WidgetEditor", customWidgetData);
+            }
+            return Json(string.Empty);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpPost]
+        public IActionResult SaveCustomWidgets(string widgetsData)
+        {
+            if (_config.GetCustomWidgetsEnabled())
+            {
+                var saveResult = _fileHelper.SaveWidgets(widgetsData);
+                return Json(saveResult);
+            }
+            return Json(false);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpPost]
+        public IActionResult DeleteCustomWidgets()
+        {
+            if (_config.GetCustomWidgetsEnabled())
+            {
+                var deleteResult = _fileHelper.DeleteWidgets();
+                return Json(deleteResult);
+            }
+            return Json(false);
+        }
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {

Controllers/MigrationController.cs

@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Npgsql;
 using System.IO.Compression;
+using JsonSerializer=System.Text.Json.JsonSerializer;
 
 namespace CarCareTracker.Controllers
 {
@@ -14,7 +15,7 @@ namespace CarCareTracker.Controllers
         private IConfigHelper _configHelper;
         private IFileHelper _fileHelper;
         private readonly ILogger<MigrationController> _logger;
-        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, IConfiguration serverConfig, ILogger<MigrationController> logger)
+        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, ILogger<MigrationController> logger)
         {
             _configHelper = configHelper;
             _fileHelper = fileHelper;
@@ -65,7 +66,7 @@ namespace CarCareTracker.Controllers
         {
             if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
             {
-                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
+                return Json(OperationResponse.Failed("Postgres connection not set up"));
             }
             var tempFolder = $"temp/{Guid.NewGuid()}";
             var tempPath = $"{tempFolder}/cartracker.db";
@@ -105,7 +106,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            Vehicle vehicle = System.Text.Json.JsonSerializer.Deserialize<Vehicle>(reader["data"] as string);
+                            Vehicle vehicle = JsonSerializer.Deserialize<Vehicle>(reader["data"] as string);
                             vehicles.Add(vehicle);
                         }
                 }
@@ -123,7 +124,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            repairrecords.Add(System.Text.Json.JsonSerializer.Deserialize<CollisionRecord>(reader["data"] as string));
+                            repairrecords.Add(JsonSerializer.Deserialize<CollisionRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in repairrecords)
@@ -140,7 +141,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            upgraderecords.Add(System.Text.Json.JsonSerializer.Deserialize<UpgradeRecord>(reader["data"] as string));
+                            upgraderecords.Add(JsonSerializer.Deserialize<UpgradeRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in upgraderecords)
@@ -157,7 +158,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            servicerecords.Add(System.Text.Json.JsonSerializer.Deserialize<ServiceRecord>(reader["data"] as string));
+                            servicerecords.Add(JsonSerializer.Deserialize<ServiceRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in servicerecords)
@@ -176,7 +177,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            gasrecords.Add(System.Text.Json.JsonSerializer.Deserialize<GasRecord>(reader["data"] as string));
+                            gasrecords.Add(JsonSerializer.Deserialize<GasRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in gasrecords)
@@ -193,7 +194,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            noterecords.Add(System.Text.Json.JsonSerializer.Deserialize<Note>(reader["data"] as string));
+                            noterecords.Add(JsonSerializer.Deserialize<Note>(reader["data"] as string));
                         }
                 }
                 foreach (var record in noterecords)
@@ -210,7 +211,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            odometerrecords.Add(System.Text.Json.JsonSerializer.Deserialize<OdometerRecord>(reader["data"] as string));
+                            odometerrecords.Add(JsonSerializer.Deserialize<OdometerRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in odometerrecords)
@@ -227,7 +228,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            reminderrecords.Add(System.Text.Json.JsonSerializer.Deserialize<ReminderRecord>(reader["data"] as string));
+                            reminderrecords.Add(JsonSerializer.Deserialize<ReminderRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in reminderrecords)
@@ -246,7 +247,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            planrecords.Add(System.Text.Json.JsonSerializer.Deserialize<PlanRecord>(reader["data"] as string));
+                            planrecords.Add(JsonSerializer.Deserialize<PlanRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in planrecords)
@@ -263,7 +264,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            planrecordtemplates.Add(System.Text.Json.JsonSerializer.Deserialize<PlanRecordInput>(reader["data"] as string));
+                            planrecordtemplates.Add(JsonSerializer.Deserialize<PlanRecordInput>(reader["data"] as string));
                         }
                 }
                 foreach (var record in planrecordtemplates)
@@ -280,7 +281,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            supplyrecords.Add(System.Text.Json.JsonSerializer.Deserialize<SupplyRecord>(reader["data"] as string));
+                            supplyrecords.Add(JsonSerializer.Deserialize<SupplyRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in supplyrecords)
@@ -297,7 +298,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            taxrecords.Add(System.Text.Json.JsonSerializer.Deserialize<TaxRecord>(reader["data"] as string));
+                            taxrecords.Add(JsonSerializer.Deserialize<TaxRecord>(reader["data"] as string));
                         }
                 }
                 foreach (var record in taxrecords)
@@ -360,7 +361,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            userconfigrecords.Add(System.Text.Json.JsonSerializer.Deserialize<UserConfigData>(reader["data"] as string));
+                            userconfigrecords.Add(JsonSerializer.Deserialize<UserConfigData>(reader["data"] as string));
                         }
                 }
                 foreach (var record in userconfigrecords)
@@ -404,7 +405,7 @@ namespace CarCareTracker.Controllers
                     using (NpgsqlDataReader reader = ctext.ExecuteReader())
                         while (reader.Read())
                         {
-                            extrafields.Add(System.Text.Json.JsonSerializer.Deserialize<RecordExtraField>(reader["data"] as string));
+                            extrafields.Add(JsonSerializer.Deserialize<RecordExtraField>(reader["data"] as string));
                         }
                 }
                 foreach (var record in extrafields)
@@ -418,24 +419,24 @@ namespace CarCareTracker.Controllers
                 #endregion
                 var destFilePath = $"{fullFolderPath}.zip";
                 ZipFile.CreateFromDirectory(fullFolderPath, destFilePath);
-                return Json(new OperationResponse { Success = true, Message = $"/{tempFolder}.zip" });
+                return Json(OperationResponse.Succeed($"/{tempFolder}.zip"));
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         public IActionResult Import(string fileName)
         {
             if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
             {
-                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
+                return Json(OperationResponse.Failed("Postgres connection not set up"));
             }
             var fullFileName = _fileHelper.GetFullFilePath(fileName);
             if (string.IsNullOrWhiteSpace(fullFileName))
             {
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
             try
             {
@@ -475,7 +476,7 @@ namespace CarCareTracker.Controllers
                     using (var ctext = pgDataSource.CreateCommand(cmd))
                     {
                         ctext.Parameters.AddWithValue("id", vehicle.Id);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(vehicle));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(vehicle));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -491,7 +492,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -507,7 +508,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -523,7 +524,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -541,7 +542,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -557,7 +558,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -573,7 +574,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -589,7 +590,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -607,7 +608,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -623,7 +624,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -639,7 +640,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -655,7 +656,7 @@ namespace CarCareTracker.Controllers
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
                         ctext.Parameters.AddWithValue("vehicleId", record.VehicleId);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -706,7 +707,7 @@ namespace CarCareTracker.Controllers
                     using (var ctext = pgDataSource.CreateCommand(cmd))
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
@@ -738,17 +739,17 @@ namespace CarCareTracker.Controllers
                     using (var ctext = pgDataSource.CreateCommand(cmd))
                     {
                         ctext.Parameters.AddWithValue("id", record.Id);
-                        ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record));
+                        ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record));
                         ctext.ExecuteNonQuery();
                     }
                 }
                 #endregion
-                return Json(new OperationResponse { Success = true, Message = "Data Imported Successfully" });
+                return Json(OperationResponse.Succeed("Data Imported Successfully"));
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
     }

Controllers/Vehicle/GasController.cs

@@ -91,10 +91,21 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_GasModal", viewModel);
         }
+        private bool DeleteGasRecordWithChecks(int gasRecordId)
+        {
+            var existingRecord = _gasRecordDataAccess.GetGasRecordById(gasRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _gasRecordDataAccess.DeleteGasRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteGasRecordById(int gasRecordId)
         {
-            var result = _gasRecordDataAccess.DeleteGasRecordById(gasRecordId);
+            var result = DeleteGasRecordWithChecks(gasRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Gas Record - Id: {gasRecordId}");

Controllers/Vehicle/ImportController.cs

@@ -3,6 +3,7 @@ using CarCareTracker.Helper;
 using CarCareTracker.MapProfile;
 using CarCareTracker.Models;
 using CsvHelper;
+using CsvHelper.Configuration;
 using Microsoft.AspNetCore.Mvc;
 using System.Globalization;
 
@@ -259,7 +260,7 @@ namespace CarCareTracker.Controllers
             {
                 using (var reader = new StreamReader(fullFileName))
                 {
-                    var config = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.InvariantCulture);
+                    var config = new CsvConfiguration(CultureInfo.InvariantCulture);
                     config.MissingFieldFound = null;
                     config.HeaderValidated = null;
                     config.PrepareHeaderForMatch = args => { return args.Header.Trim().ToLower(); };
@@ -272,13 +273,22 @@ namespace CarCareTracker.Controllers
                             var requiredExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)mode).ExtraFields.Where(x => x.IsRequired).Select(y => y.Name);
                             foreach (ImportModel importModel in records)
                             {
+                                var parsedDate = DateTime.Now.Date;
+                                if (!string.IsNullOrWhiteSpace(importModel.Date))
+                                {
+                                    parsedDate = DateTime.Parse(importModel.Date);
+                                }
+                                else if (!string.IsNullOrWhiteSpace(importModel.Day) && !string.IsNullOrWhiteSpace(importModel.Month) && !string.IsNullOrWhiteSpace(importModel.Year))
+                                {
+                                    parsedDate = new DateTime(int.Parse(importModel.Year), int.Parse(importModel.Month), int.Parse(importModel.Day));
+                                }
                                 if (mode == ImportMode.GasRecord)
                                 {
                                     //convert to gas model.
                                     var convertedRecord = new GasRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
@@ -334,9 +344,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new ServiceRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {importModel.Date}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -359,7 +369,7 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new OdometerRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         InitialMileage = string.IsNullOrWhiteSpace(importModel.InitialOdometer) ? 0 : decimal.ToInt32(decimal.Parse(importModel.InitialOdometer, NumberStyles.Any)),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
@@ -393,9 +403,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new CollisionRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {importModel.Date}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -418,9 +428,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new UpgradeRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {importModel.Date}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -443,7 +453,7 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new SupplyRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
+                                        Date = parsedDate,
                                         PartNumber = importModel.PartNumber,
                                         PartSupplier = importModel.PartSupplier,
                                         Quantity = decimal.Parse(importModel.PartQuantity, NumberStyles.Any),
@@ -460,8 +470,8 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new TaxRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = DateTime.Parse(importModel.Date),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {importModel.Date}" : importModel.Description,
+                                        Date = parsedDate,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {parsedDate.ToShortDateString()}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),

Controllers/Vehicle/NoteController.cs

@@ -12,7 +12,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetNotesByVehicleId(int vehicleId)
         {
             var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
-            result = result.OrderByDescending(x => x.Pinned).ToList();
+            result = result.OrderByDescending(x => x.Pinned).ThenBy(x => x.Description).ToList();
             return PartialView("_Notes", result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -45,10 +45,21 @@ namespace CarCareTracker.Controllers
             var result = _noteDataAccess.GetNoteById(noteId);
             return PartialView("_NoteModal", result);
         }
+        private bool DeleteNoteWithChecks(int noteId)
+        {
+            var existingRecord = _noteDataAccess.GetNoteById(noteId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _noteDataAccess.DeleteNoteById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteNoteById(int noteId)
         {
-            var result = _noteDataAccess.DeleteNoteById(noteId);
+            var result = DeleteNoteWithChecks(noteId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Note - Id: {noteId}");

Controllers/Vehicle/OdometerController.cs

@@ -140,10 +140,21 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_OdometerRecordModal", convertedResult);
         }
+        private bool DeleteOdometerRecordWithChecks(int odometerRecordId)
+        {
+            var existingRecord = _odometerRecordDataAccess.GetOdometerRecordById(odometerRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteOdometerRecordById(int odometerRecordId)
         {
-            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(odometerRecordId);
+            var result = DeleteOdometerRecordWithChecks(odometerRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Odometer Record - Id: {odometerRecordId}");

Controllers/Vehicle/PlanController.cs

@@ -27,12 +27,16 @@ namespace CarCareTracker.Controllers
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (planRecord.Supplies.Any())
             {
-                planRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description);
+                planRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description));
                 if (planRecord.CopySuppliesAttachment)
                 {
                     planRecord.Files.AddRange(GetSuppliesAttachments(planRecord.Supplies));
                 }
             }
+            if (planRecord.DeletedRequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(planRecord.DeletedRequisitionHistory, planRecord.Description);
+            }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(planRecord.ToPlanRecord());
             if (result)
             {
@@ -47,11 +51,11 @@ namespace CarCareTracker.Controllers
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(planRecord.VehicleId).Where(x => x.Description == planRecord.Description).Any();
             if (planRecord.Id == default && existingRecord)
             {
-                return Json(new OperationResponse { Success = false, Message = "A template with that description already exists for this vehicle" });
+                return Json(OperationResponse.Failed("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 });
+            return Json(OperationResponse.Conditional(result, "Template Added", string.Empty));
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
@@ -66,21 +70,43 @@ namespace CarCareTracker.Controllers
             var result = _planRecordTemplateDataAccess.DeletePlanRecordTemplateById(planRecordTemplateId);
             return Json(result);
         }
+        [HttpGet]
+        public IActionResult OrderPlanSupplies(int planRecordTemplateId)
+        {
+            var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
+            if (existingRecord.Id == default)
+            {
+                return Json(OperationResponse.Failed("Unable to find template"));
+            }
+            if (existingRecord.Supplies.Any())
+            {
+                var suppliesToOrder = CheckSupplyRecordsAvailability(existingRecord.Supplies);
+                return PartialView("_PlanOrderSupplies", suppliesToOrder);
+            } 
+            else
+            {
+                return Json(OperationResponse.Failed("Template has No Supplies"));
+            }
+        }
         [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" });
+                return Json(OperationResponse.Failed("Unable to find template"));
             }
             if (existingRecord.Supplies.Any())
             {
                 //check if all supplies are available
                 var supplyAvailability = CheckSupplyRecordsAvailability(existingRecord.Supplies);
-                if (supplyAvailability.Any())
+                if (supplyAvailability.Any(x => x.Missing))
                 {
-                    return Json(new OperationResponse { Success = false, Message = string.Join("<br>", supplyAvailability) });
+                    return Json(OperationResponse.Failed("Missing Supplies, Please Delete This Template and Recreate It."));
+                }
+                else if (supplyAvailability.Any(x => x.Insufficient))
+                {
+                    return Json(OperationResponse.Failed("Insufficient Supplies"));
                 }
             }
             if (existingRecord.ReminderRecordId != default)
@@ -89,7 +115,7 @@ namespace CarCareTracker.Controllers
                 var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(existingRecord.ReminderRecordId);
                 if (existingReminder is null || existingReminder.Id == default || !existingReminder.IsRecurring)
                 {
-                    return Json(new OperationResponse { Success = false, Message = "Missing or Non-recurring Reminder, Please Delete This Template and Recreate It." });
+                    return Json(OperationResponse.Failed("Missing or Non-recurring Reminder, Please Delete This Template and Recreate It."));
                 }
             }
             //populate createdDate
@@ -105,7 +131,7 @@ namespace CarCareTracker.Controllers
                 }
             }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord.ToPlanRecord());
-            return Json(new OperationResponse { Success = result, Message = result ? "Plan Record Added" : StaticHelper.GenericErrorMessage });
+            return Json(OperationResponse.Conditional(result, "Plan Record Added", string.Empty));
         }
         [HttpGet]
         public IActionResult GetAddPlanRecordPartialView()
@@ -125,6 +151,10 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
         {
+            if (planRecordId == default)
+            {
+                return Json(false);
+            }
             var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
             existingRecord.Progress = planProgress;
             existingRecord.DateModified = DateTime.Now;
@@ -232,7 +262,18 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult DeletePlanRecordById(int planRecordId)
         {
-            var result = _planRecordDataAccess.DeletePlanRecordById(planRecordId);
+            var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return Json(false);
+            }
+            //restore any requisitioned supplies if it has not been converted to other record types.
+            if (existingRecord.RequisitionHistory.Any() && existingRecord.Progress != PlanProgress.Done)
+            {
+                RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _planRecordDataAccess.DeletePlanRecordById(existingRecord.Id);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Plan Record - Id: {planRecordId}");

Controllers/Vehicle/ReminderController.cs

@@ -149,10 +149,21 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_ReminderRecordModal", convertedResult);
         }
+        private bool DeleteReminderRecordWithChecks(int reminderRecordId)
+        {
+            var existingRecord = _reminderRecordDataAccess.GetReminderRecordById(reminderRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _reminderRecordDataAccess.DeleteReminderRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteReminderRecordById(int reminderRecordId)
         {
-            var result = _reminderRecordDataAccess.DeleteReminderRecordById(reminderRecordId);
+            var result = DeleteReminderRecordWithChecks(reminderRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Reminder - Id: {reminderRecordId}");

Controllers/Vehicle/RepairController.cs

@@ -40,12 +40,16 @@ namespace CarCareTracker.Controllers
             collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (collisionRecord.Supplies.Any())
             {
-                collisionRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description);
+                collisionRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description));
                 if (collisionRecord.CopySuppliesAttachment)
                 {
                     collisionRecord.Files.AddRange(GetSuppliesAttachments(collisionRecord.Supplies));
                 }
             }
+            if (collisionRecord.DeletedRequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(collisionRecord.DeletedRequisitionHistory, collisionRecord.Description);
+            }
             //push back any reminders
             if (collisionRecord.ReminderRecordId.Any())
             {
@@ -87,10 +91,26 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_CollisionRecordModal", convertedResult);
         }
+        private bool DeleteCollisionRecordWithChecks(int collisionRecordId)
+        {
+            var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(collisionRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            //restore any requisitioned supplies.
+            if (existingRecord.RequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _collisionRecordDataAccess.DeleteCollisionRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteCollisionRecordById(int collisionRecordId)
         {
-            var result = _collisionRecordDataAccess.DeleteCollisionRecordById(collisionRecordId);
+            var result = DeleteCollisionRecordWithChecks(collisionRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Repair Record - Id: {collisionRecordId}");

Controllers/Vehicle/ReportController.cs

@@ -22,6 +22,8 @@ namespace CarCareTracker.Controllers
             var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
             var userConfig = _config.GetUserConfig(User);
             var viewModel = new ReportViewModel();
+            //check if custom widgets are configured
+            viewModel.CustomWidgetsConfigured = _fileHelper.WidgetsExist();
             //get totalCostMakeUp
             viewModel.CostMakeUpForVehicle = new CostMakeUpForVehicle
             {
@@ -105,7 +107,7 @@ namespace CarCareTracker.Controllers
             }).ToList();
             if (invertedFuelMileageUnit)
             {
-                foreach(CostForVehicleByMonth monthMileage in monthlyMileageData)
+                foreach (CostForVehicleByMonth monthMileage in monthlyMileageData)
                 {
                     if (monthMileage.Cost != default)
                     {
@@ -113,7 +115,7 @@ namespace CarCareTracker.Controllers
                     }
                 }
             }
-            var mpgViewModel = new MPGForVehicleByMonth { 
+            var mpgViewModel = new MPGForVehicleByMonth {
                 CostData = monthlyMileageData,
                 Unit = invertedFuelMileageUnit ? preferredFuelMileageUnit : fuelEconomyMileageUnit,
                 SortedCostData = (userConfig.UseMPG || invertedFuelMileageUnit) ? monthlyMileageData.OrderByDescending(x => x.Cost).ToList() : monthlyMileageData.OrderBy(x => x.Cost).ToList()
@@ -309,19 +311,43 @@ namespace CarCareTracker.Controllers
                 var result = _fileHelper.MakeAttachmentsExport(attachmentData);
                 if (string.IsNullOrWhiteSpace(result))
                 {
-                    return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                    return Json(OperationResponse.Failed());
                 }
-                return Json(new OperationResponse { Success = true, Message = result });
+                return Json(OperationResponse.Succeed(result));
             }
             else
             {
-                return Json(new OperationResponse { Success = false, Message = "No Attachments Found" });
+                return Json(OperationResponse.Failed("No Attachments Found"));
             }
         }
+        public IActionResult GetReportParameters()
+        {
+            var viewModel = new ReportParameter() { 
+                VisibleColumns = new List<string> {
+                    nameof(GenericReportModel.DataType),
+                    nameof(GenericReportModel.Date),
+                    nameof(GenericReportModel.Odometer),
+                    nameof(GenericReportModel.Description),
+                    nameof(GenericReportModel.Cost),
+                    nameof(GenericReportModel.Notes) 
+                }
+            };
+            //get all extra fields from service records, repairs, upgrades, and tax records.
+            var recordTypes = new List<int>() { 0, 1, 3, 4 };
+            var extraFields = new List<string>();
+            foreach(int recordType in recordTypes)
+            {
+                extraFields.AddRange(_extraFieldDataAccess.GetExtraFieldsById(recordType).ExtraFields.Select(x => x.Name));
+            }
+            viewModel.ExtraFields = extraFields.Distinct().ToList();
+
+            return PartialView("_ReportParameters", viewModel);
+        }
         [TypeFilter(typeof(CollaboratorFilter))]
-        public IActionResult GetVehicleHistory(int vehicleId)
+        public IActionResult GetVehicleHistory(int vehicleId, ReportParameter reportParameter)
         {
             var vehicleHistory = new VehicleHistoryViewModel();
+            vehicleHistory.ReportParameters = reportParameter;
             vehicleHistory.VehicleData = _dataAccess.GetVehicleById(vehicleId);
             var maxMileage = _vehicleLogic.GetMaxMileage(vehicleId);
             vehicleHistory.Odometer = maxMileage.ToString("N0");
@@ -406,7 +432,8 @@ namespace CarCareTracker.Controllers
                 Description = x.Description,
                 Notes = x.Notes,
                 Cost = x.Cost,
-                DataType = ImportMode.ServiceRecord
+                DataType = ImportMode.ServiceRecord,
+                ExtraFields = x.ExtraFields
             }));
             //repair records
             reportData.AddRange(repairRecords.Select(x => new GenericReportModel
@@ -416,7 +443,8 @@ namespace CarCareTracker.Controllers
                 Description = x.Description,
                 Notes = x.Notes,
                 Cost = x.Cost,
-                DataType = ImportMode.RepairRecord
+                DataType = ImportMode.RepairRecord,
+                ExtraFields = x.ExtraFields
             }));
             reportData.AddRange(upgradeRecords.Select(x => new GenericReportModel
             {
@@ -425,7 +453,8 @@ namespace CarCareTracker.Controllers
                 Description = x.Description,
                 Notes = x.Notes,
                 Cost = x.Cost,
-                DataType = ImportMode.UpgradeRecord
+                DataType = ImportMode.UpgradeRecord,
+                ExtraFields = x.ExtraFields
             }));
             reportData.AddRange(taxRecords.Select(x => new GenericReportModel
             {
@@ -434,7 +463,8 @@ namespace CarCareTracker.Controllers
                 Description = x.Description,
                 Notes = x.Notes,
                 Cost = x.Cost,
-                DataType = ImportMode.TaxRecord
+                DataType = ImportMode.TaxRecord,
+                ExtraFields = x.ExtraFields
             }));
             vehicleHistory.VehicleHistory = reportData.OrderBy(x => x.Date).ThenBy(x => x.Odometer).ToList();
             return PartialView("_VehicleHistory", vehicleHistory);
@@ -528,5 +558,60 @@ namespace CarCareTracker.Controllers
             }).ToList();
             return PartialView("_GasCostByMonthReport", groupedRecord);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult GetCostByMonthAndYearByVehicle(int vehicleId, List<ImportMode> selectedMetrics, int year = 0)
+        {
+            List<CostForVehicleByMonth> allCosts = StaticHelper.GetBaseLineCosts();
+            if (selectedMetrics.Contains(ImportMode.ServiceRecord))
+            {
+                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.RepairRecord))
+            {
+                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetRepairRecordSum(repairRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.UpgradeRecord))
+            {
+                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.GasRecord))
+            {
+                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.TaxRecord))
+            {
+                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, year, true));
+            }
+            if (selectedMetrics.Contains(ImportMode.OdometerRecord))
+            {
+                var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetOdometerRecordSum(odometerRecords, year, true));
+            }
+            var groupedRecord = allCosts.GroupBy(x => new { x.MonthName, x.MonthId, x.Year }).OrderByDescending(x=>x.Key.Year).Select(x => new CostForVehicleByMonth
+            {
+                Year = x.Key.Year,
+                MonthName = x.Key.MonthName,
+                Cost = x.Sum(y => y.Cost),
+                DistanceTraveled = x.Max(y => y.DistanceTraveled),
+                MonthId = x.Key.MonthId
+            }).ToList();
+            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
+            var userConfig = _config.GetUserConfig(User);
+            var viewModel = new CostDistanceTableForVehicle { CostData = groupedRecord };
+            viewModel.DistanceUnit = vehicleData.UseHours ? "h" : userConfig.UseMPG ? "mi." : "km";
+            return PartialView("_CostDistanceTableReport", viewModel);
+        }
+        [HttpGet]
+        public IActionResult GetAdditionalWidgets()
+        {
+            var widgets = _fileHelper.GetWidgets();
+            return PartialView("_ReportWidgets", widgets);
+        }
     }
 }

Controllers/Vehicle/ServiceController.cs

@@ -40,12 +40,16 @@ namespace CarCareTracker.Controllers
             serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (serviceRecord.Supplies.Any())
             {
-                serviceRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description);
+                serviceRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description));
                 if (serviceRecord.CopySuppliesAttachment)
                 {
                     serviceRecord.Files.AddRange(GetSuppliesAttachments(serviceRecord.Supplies));
                 }
             }
+            if (serviceRecord.DeletedRequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(serviceRecord.DeletedRequisitionHistory, serviceRecord.Description);
+            }
             //push back any reminders
             if (serviceRecord.ReminderRecordId.Any())
             {
@@ -87,10 +91,26 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_ServiceRecordModal", convertedResult);
         }
+        private bool DeleteServiceRecordWithChecks(int serviceRecordId)
+        {
+            var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(serviceRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            //restore any requisitioned supplies.
+            if (existingRecord.RequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _serviceRecordDataAccess.DeleteServiceRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteServiceRecordById(int serviceRecordId)
         {
-            var result = _serviceRecordDataAccess.DeleteServiceRecordById(serviceRecordId);
+            var result = DeleteServiceRecordWithChecks(serviceRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Service Record - Id: {serviceRecordId}");

Controllers/Vehicle/SupplyController.cs

@@ -7,21 +7,21 @@ namespace CarCareTracker.Controllers
 {
     public partial class VehicleController
     {
-        private List<string> CheckSupplyRecordsAvailability(List<SupplyUsage> supplyUsage)
+        private List<SupplyAvailability> CheckSupplyRecordsAvailability(List<SupplyUsage> supplyUsage)
         {
             //returns empty string if all supplies are available
-            var result = new List<string>();
+            var result = new List<SupplyAvailability>();
             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.");
+                    result.Add(new SupplyAvailability { Missing = true });
                 }
-                else if (supply.Quantity > supplyData.Quantity)
+                else
                 {
-                    result.Add($"Insufficient Quantity for {supplyData.Description}, need: {supply.Quantity}, available: {supplyData.Quantity}");
+                    result.Add(new SupplyAvailability { Missing = false, Description = supplyData.Description, Required = supply.Quantity, InStock = supplyData.Quantity });
                 }
             }
             return result;
@@ -58,6 +58,7 @@ namespace CarCareTracker.Controllers
                 //create new requisitionrrecord
                 var requisitionRecord = new SupplyUsageHistory
                 {
+                    Id = supply.SupplyId,
                     Date = dateRequisitioned,
                     Description = usageDescription,
                     Quantity = supply.Quantity,
@@ -72,6 +73,44 @@ namespace CarCareTracker.Controllers
             }
             return results;
         }
+        private void RestoreSupplyRecordsByUsage(List<SupplyUsageHistory> supplyUsage, string usageDescription)
+        {
+            foreach (SupplyUsageHistory supply in supplyUsage)
+            {
+                try
+                {
+                    if (supply.Id == default)
+                    {
+                        continue; //no id, skip current supply.
+                    }
+                    var result = _supplyRecordDataAccess.GetSupplyRecordById(supply.Id);
+                    if (result != null && result.Id != default)
+                    {
+                        //supply exists, re-add the quantity and cost
+                        result.Quantity += supply.Quantity;
+                        result.Cost += supply.Cost;
+                        var requisitionRecord = new SupplyUsageHistory
+                        {
+                            Id = supply.Id,
+                            Date = DateTime.Now.Date,
+                            Description = $"Restored from {usageDescription}",
+                            Quantity = supply.Quantity,
+                            Cost = supply.Cost
+                        };
+                        result.RequisitionHistory.Add(requisitionRecord);
+                        //save
+                        _supplyRecordDataAccess.SaveSupplyRecordToVehicle(result);
+                    }
+                    else
+                    {
+                        _logger.LogError($"Unable to find supply with id {supply.Id}");
+                    }
+                } catch (Exception ex)
+                {
+                    _logger.LogError($"Error restoring supply with id {supply.Id} : {ex.Message}");
+                }
+            }
+        }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
@@ -161,6 +200,11 @@ namespace CarCareTracker.Controllers
         public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
         {
             var result = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
+            if (result.RequisitionHistory.Any())
+            {
+                //requisition history when viewed through the supply is always immutable.
+                result.RequisitionHistory = result.RequisitionHistory.Select(x => new SupplyUsageHistory { Id = default, Cost = x.Cost, Description = x.Description, Date = x.Date, PartNumber = x.PartNumber, Quantity = x.Quantity }).ToList();
+            }
             //convert to Input object.
             var convertedResult = new SupplyRecordInput
             {
@@ -180,10 +224,24 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_SupplyRecordModal", convertedResult);
         }
+        private bool DeleteSupplyRecordWithChecks(int supplyRecordId)
+        {
+            var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
+            if (existingRecord.VehicleId != default)
+            {
+                //security check only if not editing shop supply.
+                if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+                {
+                    return false;
+                }
+            }
+            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteSupplyRecordById(int supplyRecordId)
         {
-            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(supplyRecordId);
+            var result = DeleteSupplyRecordWithChecks(supplyRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Supply Record - Id: {supplyRecordId}");

Controllers/Vehicle/TaxController.cs

@@ -110,10 +110,21 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_TaxRecordModal", convertedResult);
         }
+        private bool DeleteTaxRecordWithChecks(int taxRecordId)
+        {
+            var existingRecord = _taxRecordDataAccess.GetTaxRecordById(taxRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            var result = _taxRecordDataAccess.DeleteTaxRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteTaxRecordById(int taxRecordId)
         {
-            var result = _taxRecordDataAccess.DeleteTaxRecordById(taxRecordId);
+            var result = DeleteTaxRecordWithChecks(taxRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Tax Record - Id: {taxRecordId}");

Controllers/Vehicle/UpgradeController.cs

@@ -40,12 +40,16 @@ namespace CarCareTracker.Controllers
             upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (upgradeRecord.Supplies.Any())
             {
-                upgradeRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description);
+                upgradeRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description));
                 if (upgradeRecord.CopySuppliesAttachment)
                 {
                     upgradeRecord.Files.AddRange(GetSuppliesAttachments(upgradeRecord.Supplies));
                 }
             }
+            if (upgradeRecord.DeletedRequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(upgradeRecord.DeletedRequisitionHistory, upgradeRecord.Description);
+            }
             //push back any reminders
             if (upgradeRecord.ReminderRecordId.Any())
             {
@@ -87,10 +91,26 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_UpgradeRecordModal", convertedResult);
         }
+        private bool DeleteUpgradeRecordWithChecks(int upgradeRecordId)
+        {
+            var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(upgradeRecordId);
+            //security check.
+            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
+            {
+                return false;
+            }
+            //restore any requisitioned supplies.
+            if (existingRecord.RequisitionHistory.Any())
+            {
+                RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
+            }
+            var result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(existingRecord.Id);
+            return result;
+        }
         [HttpPost]
         public IActionResult DeleteUpgradeRecordById(int upgradeRecordId)
         {
-            var result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(upgradeRecordId);
+            var result = DeleteUpgradeRecordWithChecks(upgradeRecordId);
             if (result)
             {
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Upgrade Record - Id: {upgradeRecordId}");

Controllers/VehicleController.cs

@@ -188,15 +188,15 @@ namespace CarCareTracker.Controllers
                     }
                     else
                     {
-                        return Json(new OperationResponse { Success = false, Message = "Both vehicles already have identical collaborators" });
+                        return Json(OperationResponse.Failed("Both vehicles already have identical collaborators"));
                     }
                 }
-                return Json(new OperationResponse { Success = true, Message = "Collaborators Copied" });
+                return Json(OperationResponse.Succeed("Collaborators Copied"));
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
+                return Json(OperationResponse.Failed());
             }
         }
         
@@ -401,31 +401,31 @@ namespace CarCareTracker.Controllers
                 switch (importMode)
                 {
                     case ImportMode.ServiceRecord:
-                        result = _serviceRecordDataAccess.DeleteServiceRecordById(recordId);
+                        result = DeleteServiceRecordWithChecks(recordId);
                         break;
                     case ImportMode.RepairRecord:
-                        result = _collisionRecordDataAccess.DeleteCollisionRecordById(recordId);
+                        result = DeleteCollisionRecordWithChecks(recordId);
                         break;
                     case ImportMode.UpgradeRecord:
-                        result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(recordId);
+                        result = DeleteUpgradeRecordWithChecks(recordId);
                         break;
                     case ImportMode.GasRecord:
-                        result = _gasRecordDataAccess.DeleteGasRecordById(recordId);
+                        result = DeleteGasRecordWithChecks(recordId);
                         break;
                     case ImportMode.TaxRecord:
-                        result = _taxRecordDataAccess.DeleteTaxRecordById(recordId);
+                        result = DeleteTaxRecordWithChecks(recordId);
                         break;
                     case ImportMode.SupplyRecord:
-                        result = _supplyRecordDataAccess.DeleteSupplyRecordById(recordId);
+                        result = DeleteSupplyRecordWithChecks(recordId);
                         break;
                     case ImportMode.NoteRecord:
-                        result = _noteDataAccess.DeleteNoteById(recordId);
+                        result = DeleteNoteWithChecks(recordId);
                         break;
                     case ImportMode.OdometerRecord:
-                        result = _odometerRecordDataAccess.DeleteOdometerRecordById(recordId);
+                        result = DeleteOdometerRecordWithChecks(recordId);
                         break;
                     case ImportMode.ReminderRecord:
-                        result = _reminderRecordDataAccess.DeleteReminderRecordById(recordId);
+                        result = DeleteReminderRecordWithChecks(recordId);
                         break;
                 }
             }
@@ -494,6 +494,7 @@ namespace CarCareTracker.Controllers
             }
             return Json(result);
         }
+        [HttpPost]
         public IActionResult DuplicateRecords(List<int> recordIds, ImportMode importMode)
         {
             bool result = false;
@@ -505,6 +506,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
                         }
                         break;
@@ -512,6 +514,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(existingRecord);
                         }
                         break;
@@ -519,6 +522,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(existingRecord);
                         }
                         break;
@@ -540,6 +544,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(recordId);
                             existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(existingRecord);
                         }
                         break;
@@ -564,6 +569,15 @@ namespace CarCareTracker.Controllers
                             result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingRecord);
                         }
                         break;
+                    case ImportMode.PlanRecord:
+                        {
+                            var existingRecord = _planRecordDataAccess.GetPlanRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.ReminderRecordId = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
+                        }
+                        break;
                 }
             }
             if (result)
@@ -573,6 +587,141 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [HttpPost]
+        public IActionResult DuplicateRecordsToOtherVehicles(List<int> recordIds, List<int> vehicleIds, ImportMode importMode)
+        {
+            bool result = false;
+            if (!recordIds.Any() || !vehicleIds.Any())
+            {
+                return Json(result);
+            }
+            foreach (int recordId in recordIds)
+            {
+                switch (importMode)
+                {
+                    case ImportMode.ServiceRecord:
+                        {
+                            var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.RepairRecord:
+                        {
+                            var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.UpgradeRecord:
+                        {
+                            var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.GasRecord:
+                        {
+                            var existingRecord = _gasRecordDataAccess.GetGasRecordById(recordId);
+                            existingRecord.Id = default;
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _gasRecordDataAccess.SaveGasRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.TaxRecord:
+                        {
+                            var existingRecord = _taxRecordDataAccess.GetTaxRecordById(recordId);
+                            existingRecord.Id = default;
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _taxRecordDataAccess.SaveTaxRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.SupplyRecord:
+                        {
+                            var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(recordId);
+                            existingRecord.Id = default;
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.NoteRecord:
+                        {
+                            var existingRecord = _noteDataAccess.GetNoteById(recordId);
+                            existingRecord.Id = default;
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _noteDataAccess.SaveNoteToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.OdometerRecord:
+                        {
+                            var existingRecord = _odometerRecordDataAccess.GetOdometerRecordById(recordId);
+                            existingRecord.Id = default;
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.ReminderRecord:
+                        {
+                            var existingRecord = _reminderRecordDataAccess.GetReminderRecordById(recordId);
+                            existingRecord.Id = default;
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                    case ImportMode.PlanRecord:
+                        {
+                            var existingRecord = _planRecordDataAccess.GetPlanRecordById(recordId);
+                            existingRecord.Id = default;
+                            existingRecord.ReminderRecordId = default;
+                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
+                            foreach (int vehicleId in vehicleIds)
+                            {
+                                existingRecord.VehicleId = vehicleId;
+                                result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
+                            }
+                        }
+                        break;
+                }
+            }
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)} - to Vehicle Ids: {string.Join(",", vehicleIds)}");
+            }
+            return Json(result);
+        }
+        [HttpPost]
         public IActionResult GetGenericRecordModal(List<int> recordIds, ImportMode dataType)
         {
             var extraFields = _extraFieldDataAccess.GetExtraFieldsById((int)dataType).ExtraFields;

Enum/KioskMode.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public enum KioskMode
+    {
+        Vehicle = 0,
+        Plan = 1,
+        Reminder = 2,
+        Cycle = 3
+    }
+}

External/Implementations/Litedb/UserAccessDataAcces.cs

@@ -1,7 +1,6 @@
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
-using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {

External/Implementations/Litedb/VehicleDataAccess.cs

@@ -1,7 +1,6 @@
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
-using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {

External/Implementations/Postgres/UserAccessDataAccess.cs

@@ -1,7 +1,6 @@
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Models;
 using Npgsql;
-using System.Net.Mail;
 
 namespace CarCareTracker.External.Implementations
 {

Helper/ConfigHelper.cs

@@ -2,6 +2,7 @@
 using CarCareTracker.Models;
 using Microsoft.Extensions.Caching.Memory;
 using System.Security.Claims;
+using System.Text.Json;
 
 namespace CarCareTracker.Helper
 {
@@ -9,11 +10,13 @@ namespace CarCareTracker.Helper
     {
         OpenIDConfig GetOpenIDConfig();
         ReminderUrgencyConfig GetReminderUrgencyConfig();
+        MailConfig GetMailConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         bool AuthenticateRootUser(string username, string password);
         bool AuthenticateRootUserOIDC(string email);
         string GetWebHookUrl();
+        bool GetCustomWidgetsEnabled();
         string GetMOTD();
         string GetLogoUrl();
         string GetServerLanguage();
@@ -27,31 +30,30 @@ namespace CarCareTracker.Helper
     {
         private readonly IConfiguration _config;
         private readonly IUserConfigDataAccess _userConfig;
+        private readonly ILogger<IConfigHelper> _logger;
         private IMemoryCache _cache;
         public ConfigHelper(IConfiguration serverConfig, 
             IUserConfigDataAccess userConfig,
-            IMemoryCache memoryCache)
+            IMemoryCache memoryCache,
+            ILogger<IConfigHelper> logger)
         {
             _config = serverConfig;
             _userConfig = userConfig;
             _cache = memoryCache;
+            _logger = logger;
         }
         public string GetWebHookUrl()
         {
-            var webhook = _config["LUBELOGGER_WEBHOOK"];
-            if (string.IsNullOrWhiteSpace(webhook))
-            {
-                webhook = "";
-            }
+            var webhook = CheckString("LUBELOGGER_WEBHOOK");
             return webhook;
         }
+        public bool GetCustomWidgetsEnabled()
+        {
+            return CheckBool(CheckString("LUBELOGGER_CUSTOM_WIDGETS"));
+        }
         public string GetMOTD()
         {
-            var motd = _config["LUBELOGGER_MOTD"];
-            if (string.IsNullOrWhiteSpace(motd))
-            {
-                motd = "";
-            }
+            var motd = CheckString("LUBELOGGER_MOTD");
             return motd;
         }
         public OpenIDConfig GetOpenIDConfig()
@@ -64,27 +66,25 @@ namespace CarCareTracker.Helper
             ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig();
             return reminderUrgencyConfig;
         }
+        public MailConfig GetMailConfig()
+        {
+            MailConfig mailConfig = _config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
+            return mailConfig;
+        }
         public string GetLogoUrl()
         {
-            var logoUrl = _config["LUBELOGGER_LOGO_URL"];
-            if (string.IsNullOrWhiteSpace(logoUrl))
-            {
-                logoUrl = "/defaults/lubelogger_logo.png";
-            }
+            var logoUrl = CheckString("LUBELOGGER_LOGO_URL", "/defaults/lubelogger_logo.png");
             return logoUrl;
         }
         public string GetAllowedFileUploadExtensions()
         {
-            var allowedFileExtensions = _config["LUBELOGGER_ALLOWED_FILE_EXTENSIONS"];
-            if (string.IsNullOrWhiteSpace(allowedFileExtensions)){
-                return StaticHelper.DefaultAllowedFileExtensions;
-            }
+            var allowedFileExtensions = CheckString("LUBELOGGER_ALLOWED_FILE_EXTENSIONS", StaticHelper.DefaultAllowedFileExtensions);
             return allowedFileExtensions;
         }
         public bool AuthenticateRootUser(string username, string password)
         {
-            var rootUsername = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty;
-            var rootPassword = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty;
+            var rootUsername = CheckString(nameof(UserConfig.UserNameHash));
+            var rootPassword = CheckString(nameof(UserConfig.UserPasswordHash));
             if (string.IsNullOrWhiteSpace(rootUsername) || string.IsNullOrWhiteSpace(rootPassword))
             {
                 return false;
@@ -93,8 +93,8 @@ namespace CarCareTracker.Helper
         }
         public bool AuthenticateRootUserOIDC(string email)
         {
-            var rootEmail = _config[nameof(UserConfig.DefaultReminderEmail)] ?? string.Empty;
-            var rootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]);
+            var rootEmail = CheckString(nameof(UserConfig.DefaultReminderEmail));
+            var rootUserOIDC = CheckBool(CheckString(nameof(UserConfig.EnableRootUserOIDC)));
             if (!rootUserOIDC || string.IsNullOrWhiteSpace(rootEmail))
             {
                 return false;
@@ -103,27 +103,22 @@ namespace CarCareTracker.Helper
         }
         public string GetServerLanguage()
         {
-            var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+            var serverLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US");
             return serverLanguage;
         }
         public bool GetServerDisabledRegistration()
         {
-            var registrationDisabled = bool.Parse(_config[nameof(UserConfig.DisableRegistration)]);
+            var registrationDisabled = CheckBool(CheckString(nameof(UserConfig.DisableRegistration)));
             return registrationDisabled;
         }
         public string GetServerPostgresConnection()
         {
-            if (!string.IsNullOrWhiteSpace(_config["POSTGRES_CONNECTION"]))
-            {
-                return _config["POSTGRES_CONNECTION"];
-            } else
-            {
-                return string.Empty;
-            }
+            var postgresConnection = CheckString("POSTGRES_CONNECTION");
+            return postgresConnection;
         }
         public bool GetServerEnableShopSupplies()
         {
-            return bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)] ?? "false");
+            return CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies)));
         }
         public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
         {
@@ -141,18 +136,19 @@ namespace CarCareTracker.Helper
                     if (!File.Exists(StaticHelper.UserConfigPath))
                     {
                         //if file doesn't exist it might be because it's running on a mounted volume in docker.
-                        File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(new UserConfig()));
+                        File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(new UserConfig()));
                     }
                     var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
                     configData.EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)] ?? "false");
                     configData.UserNameHash = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty;
                     configData.UserPasswordHash = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty;
-                    File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(configData));
+                    File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(configData));
                     _cache.Set<UserConfig>($"userConfig_{userId}", configData);
                     return true;
                 }
                 catch (Exception ex)
                 {
+                    _logger.LogWarning(ex.Message);
                     return false;
                 }
             } else
@@ -173,36 +169,72 @@ namespace CarCareTracker.Helper
             var result = _userConfig.DeleteUserConfig(userId);
             return result;
         }
+        private bool CheckBool(string value, bool defaultValue = false)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    return defaultValue;
+                }
+                else if (bool.TryParse(value, out bool result))
+                {
+                    return result;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            } catch (Exception ex)
+            {
+                _logger.LogWarning($"ConfigHelper Warning: You might be missing keys in appsettings.json, Message: ${ex.Message}");
+                return defaultValue;
+            }
+        }
+        private string CheckString(string configName, string defaultValue = "")
+        {
+            try
+            {
+                var configValue = _config[configName] ?? defaultValue;
+                return configValue;
+            } catch(Exception ex)
+            {
+                _logger.LogWarning($"ConfigHelper Warning: You might be missing keys in appsettings.json, Message: ${ex.Message}");
+                return defaultValue;
+            }
+        }
         public UserConfig GetUserConfig(ClaimsPrincipal user)
         {
             var serverConfig = new UserConfig
             {
-                EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
-                UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
-                UseSystemColorMode = bool.Parse(_config[nameof(UserConfig.UseSystemColorMode)]),
-                UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
-                UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
-                EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
-                EnableRootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]),
-                HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
-                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
-                UseMarkDownOnSavedNotes = bool.Parse(_config[nameof(UserConfig.UseMarkDownOnSavedNotes)]),
-                UseThreeDecimalGasCost = bool.Parse(_config[nameof(UserConfig.UseThreeDecimalGasCost)]),
-                EnableAutoReminderRefresh = bool.Parse(_config[nameof(UserConfig.EnableAutoReminderRefresh)]),
-                EnableAutoOdometerInsert = bool.Parse(_config[nameof(UserConfig.EnableAutoOdometerInsert)]),
-                PreferredGasMileageUnit = _config[nameof(UserConfig.PreferredGasMileageUnit)],
-                PreferredGasUnit = _config[nameof(UserConfig.PreferredGasUnit)],
-                UserLanguage = _config[nameof(UserConfig.UserLanguage)],
-                HideSoldVehicles = bool.Parse(_config[nameof(UserConfig.HideSoldVehicles)]),
-                EnableShopSupplies = bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)]),
-                EnableExtraFieldColumns = bool.Parse(_config[nameof(UserConfig.EnableExtraFieldColumns)]),
-                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>(),
-                TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>(),
+                EnableCsvImports = CheckBool(CheckString(nameof(UserConfig.EnableCsvImports)), true),
+                UseDarkMode = CheckBool(CheckString(nameof(UserConfig.UseDarkMode))),
+                UseSystemColorMode = CheckBool(CheckString(nameof(UserConfig.UseSystemColorMode))),
+                UseMPG = CheckBool(CheckString(nameof(UserConfig.UseMPG)), true),
+                UseDescending = CheckBool(CheckString(nameof(UserConfig.UseDescending))),
+                EnableAuth = CheckBool(CheckString(nameof(UserConfig.EnableAuth))),
+                EnableRootUserOIDC = CheckBool(CheckString(nameof(UserConfig.EnableRootUserOIDC))),
+                HideZero = CheckBool(CheckString(nameof(UserConfig.HideZero))),
+                AutomaticDecimalFormat = CheckBool(CheckString(nameof(UserConfig.AutomaticDecimalFormat))),
+                UseUKMPG = CheckBool(CheckString(nameof(UserConfig.UseUKMPG))),
+                UseMarkDownOnSavedNotes = CheckBool(CheckString(nameof(UserConfig.UseMarkDownOnSavedNotes))),
+                UseThreeDecimalGasCost = CheckBool(CheckString(nameof(UserConfig.UseThreeDecimalGasCost)), true),
+                UseThreeDecimalGasConsumption = CheckBool(CheckString(nameof(UserConfig.UseThreeDecimalGasConsumption)), true),
+                EnableAutoReminderRefresh = CheckBool(CheckString(nameof(UserConfig.EnableAutoReminderRefresh))),
+                EnableAutoOdometerInsert = CheckBool(CheckString(nameof(UserConfig.EnableAutoOdometerInsert))),
+                PreferredGasMileageUnit = CheckString(nameof(UserConfig.PreferredGasMileageUnit)),
+                PreferredGasUnit = CheckString(nameof(UserConfig.PreferredGasUnit)),
+                UserLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US"),
+                HideSoldVehicles = CheckBool(CheckString(nameof(UserConfig.HideSoldVehicles))),
+                EnableShopSupplies = CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies))),
+                EnableExtraFieldColumns = CheckBool(CheckString(nameof(UserConfig.EnableExtraFieldColumns))),
+                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>() ?? new UserConfig().VisibleTabs,
+                TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>() ?? new UserConfig().TabOrder,
                 UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
                 ReminderUrgencyConfig = _config.GetSection(nameof(UserConfig.ReminderUrgencyConfig)).Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(),
-                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)]),
-                DefaultReminderEmail = _config[nameof(UserConfig.DefaultReminderEmail)],
-                DisableRegistration = bool.Parse(_config[nameof(UserConfig.DisableRegistration)])
+                DefaultTab = (ImportMode)int.Parse(CheckString(nameof(UserConfig.DefaultTab), "8")),
+                DefaultReminderEmail = CheckString(nameof(UserConfig.DefaultReminderEmail)),
+                DisableRegistration = CheckBool(CheckString(nameof(UserConfig.DisableRegistration)))
             };
             int userId = 0;
             if (user != null)

Helper/FileHelper.cs

@@ -16,6 +16,10 @@ namespace CarCareTracker.Helper
         int ClearTempFolder();
         int ClearUnlinkedThumbnails(List<string> linkedImages);
         int ClearUnlinkedDocuments(List<string> linkedDocuments);
+        string GetWidgets();
+        bool WidgetsExist();
+        bool SaveWidgets(string widgetsData);
+        bool DeleteWidgets();
     }
     public class FileHelper : IFileHelper
     {
@@ -100,6 +104,7 @@ namespace CarCareTracker.Helper
                 var documentPath = Path.Combine(tempPath, "documents");
                 var translationPath = Path.Combine(tempPath, "translations");
                 var dataPath = Path.Combine(tempPath, StaticHelper.DbName);
+                var widgetPath = Path.Combine(tempPath, StaticHelper.AdditionalWidgetsPath);
                 var configPath = Path.Combine(tempPath, StaticHelper.UserConfigPath);
                 if (Directory.Exists(imagePath))
                 {
@@ -174,6 +179,10 @@ namespace CarCareTracker.Helper
                     //data path will always exist as it is created on startup if not.
                     File.Move(dataPath, StaticHelper.DbName, true);
                 }
+                if (File.Exists(widgetPath))
+                {
+                    File.Move(widgetPath, StaticHelper.AdditionalWidgetsPath, true);
+                }
                 if (File.Exists(configPath))
                 {
                     //check if config folder exists.
@@ -223,6 +232,7 @@ namespace CarCareTracker.Helper
             var documentPath = Path.Combine(_webEnv.WebRootPath, "documents");
             var translationPath = Path.Combine(_webEnv.WebRootPath, "translations");
             var dataPath = StaticHelper.DbName;
+            var widgetPath = StaticHelper.AdditionalWidgetsPath;
             var configPath = StaticHelper.UserConfigPath;
             if (!Directory.Exists(tempPath))
                 Directory.CreateDirectory(tempPath);
@@ -262,6 +272,12 @@ namespace CarCareTracker.Helper
                 Directory.CreateDirectory(newPath);
                 File.Copy(dataPath, $"{newPath}/{Path.GetFileName(dataPath)}");
             }
+            if (File.Exists(widgetPath))
+            {
+                var newPath = Path.Combine(tempPath, "data");
+                Directory.CreateDirectory(newPath);
+                File.Copy(widgetPath, $"{newPath}/{Path.GetFileName(widgetPath)}");
+            }
             if (File.Exists(configPath))
             {
                 var newPath = Path.Combine(tempPath, "config");
@@ -323,12 +339,20 @@ namespace CarCareTracker.Helper
             var tempPath = GetFullFilePath("temp", false);
             if (Directory.Exists(tempPath))
             {
+                //delete files
                 var files = Directory.GetFiles(tempPath);
                 foreach (var file in files)
                 {
                     File.Delete(file);
                     filesDeleted++;
                 }
+                //delete folders
+                var folders = Directory.GetDirectories(tempPath);
+                foreach(var folder in folders)
+                {
+                    Directory.Delete(folder, true);
+                    filesDeleted++;
+                }
             }
             return filesDeleted;
         }
@@ -368,5 +392,57 @@ namespace CarCareTracker.Helper
             }
             return filesDeleted;
         }
+        public string GetWidgets()
+        {
+            if (File.Exists(StaticHelper.AdditionalWidgetsPath))
+            {
+                try
+                {
+                    //read file
+                    var widgets = File.ReadAllText(StaticHelper.AdditionalWidgetsPath);
+                    return widgets;
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex.Message);
+                    return string.Empty;
+                }
+            }
+            return string.Empty;
+        }
+        public bool WidgetsExist()
+        {
+            return File.Exists(StaticHelper.AdditionalWidgetsPath);
+        }
+        public bool SaveWidgets(string widgetsData)
+        {
+            try
+            {
+                //Delete Widgets if exists
+                DeleteWidgets();
+                File.WriteAllText(StaticHelper.AdditionalWidgetsPath, widgetsData);
+                return true;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            } 
+        }
+        public bool DeleteWidgets()
+        {
+            try
+            {
+                if (File.Exists(StaticHelper.AdditionalWidgetsPath))
+                {
+                    File.Delete(StaticHelper.AdditionalWidgetsPath);
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message);
+                return false;
+            }
+        }
     }
 }

Helper/MailHelper.cs

@@ -1,6 +1,7 @@
 using CarCareTracker.Models;
 using MimeKit;
 using MailKit.Net.Smtp;
+using MailKit.Security;
 
 namespace CarCareTracker.Helper
 {
@@ -17,12 +18,12 @@ namespace CarCareTracker.Helper
         private readonly IFileHelper _fileHelper;
         private readonly ILogger<MailHelper> _logger;
         public MailHelper(
-            IConfiguration config,
+            IConfigHelper config,
             IFileHelper fileHelper,
             ILogger<MailHelper> logger
             ) {
             //load mailConfig from Configuration
-            mailConfig = config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
+            mailConfig = config.GetMailConfig();
             _fileHelper = fileHelper;
             _logger = logger;
         }
@@ -30,79 +31,79 @@ namespace CarCareTracker.Helper
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token)) {
-                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+                return OperationResponse.Failed("Email Address or Token is invalid");
             }
             string emailSubject = "Your Registration Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please complete your registration for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
+                return OperationResponse.Succeed("Email Sent!");
             } else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public OperationResponse NotifyUserForPasswordReset(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
             {
-                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+                return OperationResponse.Failed("Email Address or Token is invalid");
             }
             string emailSubject = "Your Password Reset Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please reset your password for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
+                return OperationResponse.Succeed("Email Sent!");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public OperationResponse NotifyUserForAccountUpdate(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
             {
-                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+                return OperationResponse.Failed("Email Address or Token is invalid");
             }
             string emailSubject = "Your User Account Update Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please update your account for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress}, emailSubject, emailBody);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
+                return OperationResponse.Succeed("Email Sent!");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+                return OperationResponse.Failed("SMTP Server Not Setup");
             }
             if (!emailAddresses.Any())
             {
-                return new OperationResponse { Success = false, Message = "No recipients could be found" };
+                return OperationResponse.Failed("No recipients could be found");
             }
             if (!reminders.Any())
             {
-                return new OperationResponse { Success = false, Message = "No reminders could be found" };
+                return OperationResponse.Failed("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);
@@ -122,14 +123,14 @@ namespace CarCareTracker.Helper
                 var result = SendEmail(emailAddresses, emailSubject, emailBody);
                 if (result)
                 {
-                    return new OperationResponse { Success = true, Message = "Email Sent!" };
+                    return OperationResponse.Succeed("Email Sent!");
                 } else
                 {
-                    return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                    return OperationResponse.Failed();
                 }
             } catch (Exception ex)
             {
-                return new OperationResponse { Success = false, Message = ex.Message };
+                return OperationResponse.Failed(ex.Message);
             }
         }
         private bool SendEmail(List<string> emailTo, string emailSubject, string emailBody) {
@@ -151,7 +152,7 @@ namespace CarCareTracker.Helper
 
             using (var client = new SmtpClient())
             {
-                client.Connect(server, mailConfig.Port, MailKit.Security.SecureSocketOptions.Auto);
+                client.Connect(server, mailConfig.Port, SecureSocketOptions.Auto);
                 //perform authentication if either username or password is provided.
                 //do not perform authentication if neither are provided.
                 if (!string.IsNullOrWhiteSpace(mailConfig.Username) || !string.IsNullOrWhiteSpace(mailConfig.Password)) {

Helper/ReminderHelper.cs

@@ -79,6 +79,7 @@ namespace CarCareTracker.Helper
                     Description = reminder.Description,
                     Notes = reminder.Notes,
                     Metric = reminder.Metric,
+                    UserMetric = reminder.Metric,
                     IsRecurring = reminder.IsRecurring,
                     Tags = reminder.Tags
                 };

Helper/ReportHelper.cs

@@ -5,93 +5,166 @@ 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);
-        IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0);
-        IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0);
+        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0, bool sortIntoYear = false);
     }
     public class ReportHelper: IReportHelper
     {
-        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0, bool sortIntoYear = false)
         {
             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
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = 0,
-                DistanceTraveled = x.Sum(y=>y.DistanceTraveled)
-            });
+                return odometerRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = 0,
+                    DistanceTraveled = x.Sum(y => y.DistanceTraveled)
+                });
+            } else
+            {
+                return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = 0,
+                    DistanceTraveled = x.Sum(y => y.DistanceTraveled)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 serviceRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return serviceRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return serviceRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return serviceRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 repairRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return repairRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return repairRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return repairRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 upgradeRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return upgradeRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return upgradeRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return upgradeRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 gasRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return gasRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
-        public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0)
+        public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0, bool sortIntoYear = false)
         {
             if (year != default)
             {
                 taxRecords.RemoveAll(x => x.Date.Year != year);
             }
-            return taxRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            if (sortIntoYear)
             {
-                MonthId = x.Key,
-                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                Cost = x.Sum(y => y.Cost)
-            });
+                return taxRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key.Month,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
+                    Year = x.Key.Year,
+                    Cost = x.Sum(y => y.Cost)
+                });
+            } else
+            {
+                return taxRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+                {
+                    MonthId = x.Key,
+                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                    Cost = x.Sum(y => y.Cost)
+                });
+            }
         }
     }
 }

Helper/StaticHelper.cs

@@ -9,15 +9,17 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public static string VersionNumber = "1.3.9";
-        public static string DbName = "data/cartracker.db";
-        public static string UserConfigPath = "config/userConfig.json";
-        public static string GenericErrorMessage = "An error occurred, please try again later";
-        public static string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
-        public static string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
-        public static string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
-        public static string TranslationPath = "https://hargata.github.io/lubelog_translations";
-        public static string TranslationDirectoryPath = $"{TranslationPath}/directory.json";
+        public const string VersionNumber = "1.4.1";
+        public const string DbName = "data/cartracker.db";
+        public const string UserConfigPath = "config/userConfig.json";
+        public const string AdditionalWidgetsPath = "data/widgets.html";
+        public const string GenericErrorMessage = "An error occurred, please try again later";
+        public const string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
+        public const string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
+        public const string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
+        public const string TranslationPath = "https://hargata.github.io/lubelog_translations";
+        public const string TranslationDirectoryPath = $"{TranslationPath}/directory.json";
+        public const string ReportNote = "Report generated by LubeLogger, a Free and Open Source Vehicle Maintenance Tracker - LubeLogger.com";
         public static string GetTitleCaseReminderUrgency(ReminderUrgency input)
         {
             switch (input)
@@ -32,6 +34,66 @@ namespace CarCareTracker.Helper
                     return input.ToString();
             }
         }
+        public static string GetTitleCaseReminderUrgency(string input)
+        {
+            switch (input)
+            {
+                case "NotUrgent":
+                    return "Not Urgent";
+                case "VeryUrgent":
+                    return "Very Urgent";
+                case "PastDue":
+                    return "Past Due";
+                default:
+                    return input;
+            }
+        }
+        public static string GetReminderUrgencyColor(ReminderUrgency input)
+        {
+            switch (input)
+            {
+                case ReminderUrgency.NotUrgent:
+                    return "text-bg-success";
+                case ReminderUrgency.VeryUrgent:
+                    return "text-bg-danger";
+                case ReminderUrgency.PastDue:
+                    return "text-bg-secondary";
+                default:
+                    return "text-bg-warning";
+            }
+        }
+
+        public static string GetPlanRecordColor(PlanPriority input)
+        {
+            switch (input)
+            {
+                case PlanPriority.Critical:
+                    return "text-bg-danger";
+                case PlanPriority.Normal:
+                    return "text-bg-primary";
+                case PlanPriority.Low:
+                    return "text-bg-info";
+                default:
+                    return "text-bg-primary";
+            }
+        }
+
+        public static string GetPlanRecordProgress(PlanProgress input)
+        {
+            switch (input)
+            {
+                case PlanProgress.Backlog:
+                    return "Planned";
+                case PlanProgress.InProgress:
+                    return "Doing";
+                case PlanProgress.Testing:
+                    return "Testing";
+                case PlanProgress.Done:
+                    return "Done";
+                default:
+                    return input.ToString();
+            }
+        }
 
         public static string TruncateStrings(string input, int maxLength = 25)
         {
@@ -539,6 +601,27 @@ namespace CarCareTracker.Helper
                 _csv.NextRecord();
             }
         }
+        public static string HideZeroCost(string input, bool hideZero, string decorations = "")
+        {
+            if (input == 0M.ToString("C2") && hideZero)
+            {
+                return "---";
+            } else
+            {
+                return string.IsNullOrWhiteSpace(decorations) ? input : $"{input}{decorations}";
+            }
+        }
+        public static string HideZeroCost(decimal input, bool hideZero, string decorations = "")
+        {
+            if (input == default && hideZero)
+            {
+                return "---";
+            }
+            else
+            {
+                return string.IsNullOrWhiteSpace(decorations) ? input.ToString("C2") : $"{input.ToString("C2")}{decorations}";
+            }
+        }
         public static void WriteGasRecordExportModel(CsvWriter _csv, IEnumerable<GasRecordExportModel> genericRecords)
         {
             var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();

Helper/TranslationHelper.cs

@@ -107,7 +107,10 @@ namespace CarCareTracker.Helper
                     {
                         foreach(var translation in translationDictionary)
                         {
-                            defaultTranslation[translation.Key] = translation.Value;
+                            if (defaultTranslation.ContainsKey(translation.Key))
+                            {
+                                defaultTranslation[translation.Key] = translation.Value;
+                            }
                         }
                     }
                     return defaultTranslation ?? new Dictionary<string, string>();
@@ -123,19 +126,21 @@ namespace CarCareTracker.Helper
         }
         public OperationResponse SaveTranslation(string userLanguage, Dictionary<string, string> translations)
         {
-            if (userLanguage == "en_US")
+            bool create = bool.Parse(_config["LUBELOGGER_TRANSLATOR"] ?? "false");
+            bool isDefaultLanguage = userLanguage == "en_US";
+            if (isDefaultLanguage && !create)
             {
-                return new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." };
+                return OperationResponse.Failed("The translation file name en_US is reserved.");
             }
             if (string.IsNullOrWhiteSpace(userLanguage))
             {
-                return new OperationResponse { Success = false, Message = "File name is not provided." };
+                return OperationResponse.Failed("File name is not provided.");
             }
             if (!translations.Any())
             {
-                return new OperationResponse { Success = false, Message = "Translation has no data." };
+                return OperationResponse.Failed("Translation has no data.");
             }
-            var translationFilePath = _fileHelper.GetFullFilePath($"/translations/{userLanguage}.json", false);
+            var translationFilePath = isDefaultLanguage ? _fileHelper.GetFullFilePath($"/defaults/en_US.json") : _fileHelper.GetFullFilePath($"/translations/{userLanguage}.json", false);
             try
             {
                 if (File.Exists(translationFilePath))
@@ -145,15 +150,21 @@ namespace CarCareTracker.Helper
                     _cache.Remove($"lang_{userLanguage}"); //clear out cache, force a reload from file.
                 } else
                 {
+                    //check if directory exists first.
+                    var translationDirectory = _fileHelper.GetFullFilePath("translations/", false);
+                    if (!Directory.Exists(translationDirectory))
+                    {
+                        Directory.CreateDirectory(translationDirectory);
+                    }
                     //write to file
                     File.WriteAllText(translationFilePath, JsonSerializer.Serialize(translations));
                 }
-                return new OperationResponse { Success = true, Message = "Translation Updated" };
+                return OperationResponse.Succeed("Translation Updated");
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public string ExportTranslation(Dictionary<string, string> translations)
@@ -167,7 +178,13 @@ namespace CarCareTracker.Helper
                     Directory.CreateDirectory(uploadDirectory);
                 }
                 var saveFilePath = _fileHelper.GetFullFilePath(tempFileName, false);
-                File.WriteAllText(saveFilePath, JsonSerializer.Serialize(translations));
+                //standardize translation format for export only.
+                Dictionary<string, string> sortedTranslations = new Dictionary<string, string>();
+                foreach (var translation in translations.OrderBy(x => x.Key))
+                {
+                    sortedTranslations.Add(translation.Key, translation.Value);
+                };
+                File.WriteAllText(saveFilePath, JsonSerializer.Serialize(sortedTranslations, new JsonSerializerOptions { WriteIndented = true }));
                 return tempFileName;
             } 
             catch(Exception ex)

Logic/LoginLogic.cs

@@ -71,13 +71,13 @@ namespace CarCareTracker.Logic
             var existingUser = _userData.GetUserRecordById(userId);
             if (existingUser.Id == default)
             {
-                return new OperationResponse { Success = false, Message = "Invalid user" };
+                return OperationResponse.Failed("Invalid user");
             }
             //validate user token
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != existingUser.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             if (!string.IsNullOrWhiteSpace(credentials.UserName) && existingUser.UserName != credentials.UserName)
             {
@@ -85,7 +85,7 @@ namespace CarCareTracker.Logic
                 var existingUserWithUserName = _userData.GetUserRecordByUserName(credentials.UserName);
                 if (existingUserWithUserName.Id != default)
                 {
-                    return new OperationResponse { Success = false, Message = "Username already taken" };
+                    return OperationResponse.Failed("Username already taken");
                 }
                 existingUser.UserName = credentials.UserName;
             }
@@ -95,7 +95,7 @@ namespace CarCareTracker.Logic
                 var existingUserWithEmailAddress = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
                 if (existingUserWithEmailAddress.Id != default)
                 {
-                    return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+                    return OperationResponse.Failed("A user with that email already exists");
                 }
                 existingUser.EmailAddress = credentials.EmailAddress;
             }
@@ -107,7 +107,7 @@ namespace CarCareTracker.Logic
             //delete token
             _tokenData.DeleteToken(existingToken.Id);
             var result = _userData.SaveUserRecord(existingUser);
-            return new OperationResponse { Success = result, Message = result ? "User Updated" : StaticHelper.GenericErrorMessage };
+            return OperationResponse.Conditional(result, "User Updated", string.Empty);
         }
         public OperationResponse RegisterOpenIdUser(LoginModel credentials)
         {
@@ -115,21 +115,21 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName))
             {
-                return new OperationResponse { Success = false, Message = "Username cannot be blank" };
+                return OperationResponse.Failed("Username cannot be blank");
             }
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "Username already taken" };
+                return OperationResponse.Failed("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" };
+                return OperationResponse.Failed("A user with that email already exists");
             }
             _tokenData.DeleteToken(existingToken.Id);
             var newUser = new UserData()
@@ -141,11 +141,11 @@ namespace CarCareTracker.Logic
             var result = _userData.SaveUserRecord(newUser);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "You will be logged in briefly." };
+                return OperationResponse.Succeed("You will be logged in briefly.");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+                return OperationResponse.Failed("Something went wrong, please try again later.");
             }
         }
         //handles user registration
@@ -155,22 +155,22 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             //token is valid, check if username and password is acceptable and that username is unique.
             if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName) || string.IsNullOrWhiteSpace(credentials.Password))
             {
-                return new OperationResponse { Success = false, Message = "Neither username nor password can be blank" };
+                return OperationResponse.Failed("Neither username nor password can be blank");
             }
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "Username already taken" };
+                return OperationResponse.Failed("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" };
+                return OperationResponse.Failed("A user with that email already exists");
             }
             //username is unique then we delete the token and create the user.
             _tokenData.DeleteToken(existingToken.Id);
@@ -183,11 +183,11 @@ namespace CarCareTracker.Logic
             var result = _userData.SaveUserRecord(newUser);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "You will be redirected to the login page briefly." };
+                return OperationResponse.Succeed("You will be redirected to the login page briefly.");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+                return OperationResponse.Failed();
             }
         }
         /// <summary>
@@ -205,24 +205,24 @@ namespace CarCareTracker.Logic
             }
             //for security purposes we want to always return true for this method.
             //otherwise someone can spam the reset password method to sniff out users.
-            return new OperationResponse { Success = true, Message = "If your user exists in the system you should receive an email shortly with instructions on how to proceed." };
+            return OperationResponse.Succeed("If your user exists in the system you should receive an email shortly with instructions on how to proceed.");
         }
         public OperationResponse ResetPasswordByUser(LoginModel credentials)
         {
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return new OperationResponse { Success = false, Message = "Invalid Token" };
+                return OperationResponse.Failed("Invalid Token");
             }
             if (string.IsNullOrWhiteSpace(credentials.Password))
             {
-                return new OperationResponse { Success = false, Message = "New Password cannot be blank" };
+                return OperationResponse.Failed("New Password cannot be blank");
             }
             //if token is valid.
             var existingUser = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (existingUser.Id == default)
             {
-                return new OperationResponse { Success = false, Message = "Unable to locate user" };
+                return OperationResponse.Failed("Unable to locate user");
             }
             existingUser.Password = GetHash(credentials.Password);
             var result = _userData.SaveUserRecord(existingUser);
@@ -230,10 +230,10 @@ namespace CarCareTracker.Logic
             _tokenData.DeleteToken(existingToken.Id);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Password resetted, you will be redirected to login page shortly." };
+                return OperationResponse.Succeed("Password resetted, you will be redirected to login page shortly.");
             } else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         /// <summary>
@@ -310,7 +310,7 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByEmailAddress(emailAddress);
             if (existingToken.Id != default)
             {
-                return new OperationResponse { Success = false, Message = "There is an existing token tied to this email address" };
+                return OperationResponse.Failed("There is an existing token tied to this email address");
             }
             var token = new Token()
             {
@@ -323,16 +323,16 @@ namespace CarCareTracker.Logic
                 result = _mailHelper.NotifyUserForRegistration(emailAddress, token.Body).Success;
                 if (!result)
                 {
-                    return new OperationResponse { Success = false, Message = "Token Generated, but Email failed to send, please check your SMTP settings." };
+                    return OperationResponse.Failed("Token Generated, but Email failed to send, please check your SMTP settings.");
                 }
             }
             if (result)
             {
-                return new OperationResponse { Success = true, Message = "Token Generated!" };
+                return OperationResponse.Succeed("Token Generated!");
             }
             else
             {
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
         }
         public bool DeleteUserToken(int tokenId)
@@ -351,18 +351,18 @@ namespace CarCareTracker.Logic
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id == default)
             {
-                return new OperationResponse { Success = false, Message = "Unable to find user" };
+                return OperationResponse.Failed("Unable to find user");
             }
             var newPassword = Guid.NewGuid().ToString().Substring(0, 8);
             existingUser.Password = GetHash(newPassword);
             var result = _userData.SaveUserRecord(existingUser);
             if (result)
             {
-                return new OperationResponse { Success = true, Message = newPassword };
+                return OperationResponse.Succeed(newPassword);
             }
             else
             {
-                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+                return OperationResponse.Failed();
             }
         }
         #endregion

Logic/UserLogic.cs

@@ -51,16 +51,16 @@ namespace CarCareTracker.Logic
                 var userAccess = _userAccess.GetUserAccessByVehicleAndUserId(existingUser.Id, vehicleId);
                 if (userAccess != null)
                 {
-                    return new OperationResponse { Success = false, Message = "User is already a collaborator" };
+                    return OperationResponse.Failed("User is already a collaborator");
                 }
                 var result = AddUserAccessToVehicle(existingUser.Id, vehicleId);
                 if (result)
                 {
-                    return new OperationResponse { Success = true, Message = "Collaborator Added" };
+                    return OperationResponse.Succeed("Collaborator Added");
                 }
-                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+                return OperationResponse.Failed();
             }
-            return new OperationResponse { Success = false, Message = $"Unable to find user {username} in the system" };
+            return OperationResponse.Failed($"Unable to find user {username} in the system");
         }
         public bool DeleteCollaboratorFromVehicle(int userId, int vehicleId)
         {

Logic/VehicleLogic.cs

@@ -14,6 +14,9 @@ namespace CarCareTracker.Logic
         int GetMinMileage(VehicleRecords vehicleRecords);
         int GetOwnershipDays(string purchaseDate, string soldDate, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords);
         bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, int currentMileage);
+        List<VehicleInfo> GetVehicleInfo(List<Vehicle> vehicles);
+        List<ReminderRecordViewModel> GetReminders(List<Vehicle> vehicles, bool isCalendar);
+        List<PlanRecord> GetPlans(List<Vehicle> vehicles, bool excludeDone);
     }
     public class VehicleLogic: IVehicleLogic
     {
@@ -24,6 +27,7 @@ namespace CarCareTracker.Logic
         private readonly ITaxRecordDataAccess _taxRecordDataAccess;
         private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
+        private readonly IPlanRecordDataAccess _planRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
         public VehicleLogic(
             IServiceRecordDataAccess serviceRecordDataAccess,
@@ -33,6 +37,7 @@ namespace CarCareTracker.Logic
             ITaxRecordDataAccess taxRecordDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
+            IPlanRecordDataAccess planRecordDataAccess,
             IReminderHelper reminderHelper
             ) {
             _serviceRecordDataAccess = serviceRecordDataAccess;
@@ -41,6 +46,7 @@ namespace CarCareTracker.Logic
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
             _taxRecordDataAccess = taxRecordDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
+            _planRecordDataAccess = planRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _reminderHelper = reminderHelper;
         }
@@ -218,5 +224,98 @@ namespace CarCareTracker.Logic
             var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
             return results.Any(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue);
         }
+
+        public List<VehicleInfo> GetVehicleInfo(List<Vehicle> vehicles)
+        {
+            List<VehicleInfo> apiResult = new List<VehicleInfo>();
+
+            foreach (Vehicle vehicle in vehicles)
+            {
+                var currentMileage = GetMaxMileage(vehicle.Id);
+                var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
+                var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
+
+                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicle.Id);
+                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicle.Id);
+                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicle.Id);
+                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicle.Id);
+                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicle.Id);
+                var planRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicle.Id);
+
+                var resultToAdd = new VehicleInfo()
+                {
+                    VehicleData = vehicle,
+                    LastReportedOdometer = currentMileage,
+                    ServiceRecordCount = serviceRecords.Count(),
+                    ServiceRecordCost = serviceRecords.Sum(x => x.Cost),
+                    RepairRecordCount = repairRecords.Count(),
+                    RepairRecordCost = repairRecords.Sum(x => x.Cost),
+                    UpgradeRecordCount = upgradeRecords.Count(),
+                    UpgradeRecordCost = upgradeRecords.Sum(x => x.Cost),
+                    GasRecordCount = gasRecords.Count(),
+                    GasRecordCost = gasRecords.Sum(x => x.Cost),
+                    TaxRecordCount = taxRecords.Count(),
+                    TaxRecordCost = taxRecords.Sum(x => x.Cost),
+                    VeryUrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.VeryUrgent),
+                    PastDueReminderCount = results.Count(x => x.Urgency == ReminderUrgency.PastDue),
+                    UrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.Urgent),
+                    NotUrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.NotUrgent),
+                    PlanRecordBackLogCount = planRecords.Count(x => x.Progress == PlanProgress.Backlog),
+                    PlanRecordInProgressCount = planRecords.Count(x => x.Progress == PlanProgress.InProgress),
+                    PlanRecordTestingCount = planRecords.Count(x => x.Progress == PlanProgress.Testing),
+                    PlanRecordDoneCount = planRecords.Count(x => x.Progress == PlanProgress.Done)
+                };
+                //set next reminder
+                if (results.Any(x => (x.Metric == ReminderMetric.Date || x.Metric == ReminderMetric.Both) && x.Date >= DateTime.Now.Date))
+                {
+                    resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
+                }
+                else if (results.Any(x => (x.Metric == ReminderMetric.Odometer || x.Metric == ReminderMetric.Both) && x.Mileage >= currentMileage))
+                {
+                    resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
+                }
+                apiResult.Add(resultToAdd);
+            }
+            return apiResult;
+        }
+        public List<ReminderRecordViewModel> GetReminders(List<Vehicle> vehicles, bool isCalendar)
+        {
+            List<ReminderRecordViewModel> reminders = new List<ReminderRecordViewModel>();
+            foreach (Vehicle vehicle in vehicles)
+            {
+                var vehicleReminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
+                if (isCalendar)
+                {
+                    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 vehicleMileage = isCalendar ? 0 : GetMaxMileage(vehicle.Id);
+                    var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(vehicleReminders, vehicleMileage, DateTime.Now);
+                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Id = x.Id, Metric = x.Metric, Date = x.Date, Notes = x.Notes, Mileage = x.Mileage, Urgency = x.Urgency, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" }).ToList();
+                    reminders.AddRange(reminderUrgency);
+                }
+            }
+            return reminders.OrderByDescending(x=>x.Urgency).ToList();
+        }
+        public List<PlanRecord> GetPlans(List<Vehicle> vehicles, bool excludeDone)
+        {
+            List<PlanRecord> plans = new List<PlanRecord>();
+            foreach (Vehicle vehicle in vehicles)
+            {
+                var vehiclePlans = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicle.Id);
+                if (excludeDone)
+                {
+                    vehiclePlans.RemoveAll(x => x.Progress == PlanProgress.Done);
+                }
+                if (vehiclePlans.Any())
+                {
+                    var convertedPlans = vehiclePlans.Select(x => new PlanRecord { ImportMode = x.ImportMode, Priority = x.Priority, Progress = x.Progress, Notes = x.Notes, RequisitionHistory = x.RequisitionHistory, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" });
+                    plans.AddRange(convertedPlans);
+                }
+            }
+            return plans.OrderBy(x => x.Priority).ThenBy(x=>x.Progress).ToList();
+        }
     }
 }

MapProfile/ImportMappers.cs

@@ -8,18 +8,21 @@ namespace CarCareTracker.MapProfile
         public ImportMapper()
         {
             Map(m => m.Date).Name(["date", "fuelup_date"]);
+            Map(m => m.Day).Name(["day"]);
+            Map(m => m.Month).Name(["month"]);
+            Map(m => m.Year).Name(["year"]);
             Map(m => m.DateCreated).Name(["datecreated"]);
             Map(m => m.DateModified).Name(["datemodified"]);
             Map(m => m.InitialOdometer).Name(["initialodometer"]);
-            Map(m => m.Odometer).Name(["odometer"]);
-            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed"]);
+            Map(m => m.Odometer).Name(["odometer", "odo"]);
+            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed", "qty"]);
             Map(m => m.Cost).Name(["cost", "total cost", "totalcost", "total price"]);
             Map(m => m.Notes).Name("notes", "note");
             Map(m => m.Price).Name(["price"]);
-            Map(m => m.PartialFuelUp).Name(["partial_fuelup"]);
+            Map(m => m.PartialFuelUp).Name(["partial_fuelup", "partial tank", "partial_fill"]);
             Map(m => m.IsFillToFull).Name(["isfilltofull", "filled up"]);
             Map(m => m.Description).Name(["description"]);
-            Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup"]);
+            Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup", "missed fill up", "missed_fill"]);
             Map(m => m.PartSupplier).Name(["partsupplier"]);
             Map(m => m.PartQuantity).Name(["partquantity"]);
             Map(m => m.PartNumber).Name(["partnumber"]);

Middleware/Authen.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Options;
 using System.Security.Claims;
+using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 
@@ -27,7 +28,7 @@ namespace CarCareTracker.Middleware
             _httpContext = httpContext;
             _dataProtector = securityProvider.CreateProtector("login");
             _loginLogic = loginLogic;
-            enableAuth = bool.Parse(configuration["EnableAuth"]);
+            enableAuth = bool.Parse(configuration["EnableAuth"] ?? "false");
         }
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
@@ -42,7 +43,7 @@ namespace CarCareTracker.Middleware
                     new(ClaimTypes.Role, nameof(UserData.IsRootUser))
                 };
                 appIdentity.AddClaims(userIdentity);
-                AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name);
+                AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), Scheme.Name);
                 return AuthenticateResult.Success(ticket);
             }
             else
@@ -59,7 +60,7 @@ namespace CarCareTracker.Middleware
                 {
                     var cleanedHeader = request_header.ToString().Replace("Basic ", "").Trim();
                     byte[] data = Convert.FromBase64String(cleanedHeader);
-                    string decodedString = System.Text.Encoding.UTF8.GetString(data);
+                    string decodedString = Encoding.UTF8.GetString(data);
                     var splitString = decodedString.Split(":");
                     if (splitString.Count() != 2)
                     {
@@ -85,7 +86,7 @@ namespace CarCareTracker.Middleware
                                 userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsRootUser)));
                             }
                             appIdentity.AddClaims(userIdentity);
-                            AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name);
+                            AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), Scheme.Name);
                             return AuthenticateResult.Success(ticket);
                         }
                     }
@@ -133,7 +134,7 @@ namespace CarCareTracker.Middleware
                                     userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsRootUser)));
                                 }
                                 appIdentity.AddClaims(userIdentity);
-                                AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name);
+                                AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), Scheme.Name);
                                 return AuthenticateResult.Success(ticket);
                             }
                         }

Models/Collision/CollisionRecordInput.cs

@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public CollisionRecord ToCollisionRecord() { return new CollisionRecord { 
             Id = Id, 

Models/Kiosk/KioskViewModel.cs

@@ -0,0 +1,14 @@
+namespace CarCareTracker.Models
+{
+    public class KioskViewModel
+    {
+        /// <summary>
+        /// List of vehicle ids to exclude from Kiosk Dashboard
+        /// </summary>
+        public List<int> Exclusions { get; set; } = new List<int>();
+        /// <summary>
+        /// Whether to retrieve data for vehicle, plans, or reminder view.
+        /// </summary>
+        public KioskMode KioskMode { get; set; } = KioskMode.Vehicle;
+    }
+}

Models/OperationResponse.cs

@@ -1,8 +1,33 @@
-namespace CarCareTracker.Models
+using CarCareTracker.Helper;
+
+namespace CarCareTracker.Models
 {
-    public class OperationResponse
+    public class OperationResponseBase
     {
         public bool Success { get; set; }
         public string Message { get; set; }
     }
+    public class OperationResponse: OperationResponseBase
+    {
+        public static OperationResponse Succeed(string message = "")
+        {
+            return new OperationResponse { Success = true, Message = message };
+        }
+        public static OperationResponse Failed(string message = "")
+        {
+            if (string.IsNullOrWhiteSpace(message))
+            {
+                message = StaticHelper.GenericErrorMessage;
+            }
+            return new OperationResponse { Success = false, Message = message};
+        }
+        public static OperationResponse Conditional(bool result, string successMessage = "", string errorMessage = "")
+        {
+            if (string.IsNullOrWhiteSpace(errorMessage))
+            {
+                errorMessage = StaticHelper.GenericErrorMessage;
+            }
+            return new OperationResponse { Success = result, Message = result ? successMessage : errorMessage };
+        }
+    }    
 }

Models/PlanRecord/PlanRecordInput.cs

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

Models/Reminder/ReminderRecordViewModel.cs

@@ -9,6 +9,10 @@
         public string Description { get; set; }
         public string Notes { get; set; }
         /// <summary>
+        /// The metric the user selected to calculate the urgency of this reminder.
+        /// </summary>
+        public ReminderMetric UserMetric { get; set; } = ReminderMetric.Date;
+        /// <summary>
         /// Reason why this reminder is urgent
         /// </summary>
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;

Models/Report/CostDistanceTableForVehicle.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class CostDistanceTableForVehicle
+    {
+        public string DistanceUnit { get; set; } = "mi.";
+        public List<CostForVehicleByMonth> CostData { get; set; } = new List<CostForVehicleByMonth>();
+    }
+}

Models/Report/CostForVehicleByMonth.cs

@@ -2,9 +2,11 @@
 {
     public class CostForVehicleByMonth
     {
+        public int Year { get; set; }
         public int MonthId { get; set; }
         public string MonthName { get; set; }
         public decimal Cost { get; set; }
         public int DistanceTraveled { get; set; }
+        public decimal CostPerDistanceTraveled { get { if (DistanceTraveled > 0) { return Cost / DistanceTraveled; } else { return 0M; } } }
     }
 }

Models/Report/GenericReportModel.cs

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

Models/Report/ReportParameter.cs

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

Models/Report/ReportViewModel.cs

@@ -8,5 +8,6 @@
         public ReminderMakeUpForVehicle ReminderMakeUpForVehicle { get; set; } = new ReminderMakeUpForVehicle();
         public List<int> Years { get; set; } = new List<int>();
         public List<UserCollaborator> Collaborators { get; set; } = new List<UserCollaborator>();
+        public bool CustomWidgetsConfigured { get; set; } = false;
     }
 }

Models/Report/VehicleHistoryViewModel.cs

@@ -4,6 +4,7 @@
     {
         public Vehicle VehicleData { get; set; }
         public List<GenericReportModel> VehicleHistory { get; set; }
+        public ReportParameter ReportParameters { get; set; }
         public string Odometer { get; set; }
         public string MPG { get; set; }
         public decimal TotalCost { get; set; }

Models/ServiceRecord/ServiceRecordInput.cs

@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public ServiceRecord ToServiceRecord() { return new ServiceRecord { 
             Id = Id, 

Models/Shared/ImportModel.cs

@@ -6,6 +6,9 @@
     public class ImportModel
     {
         public string Date { get; set; }
+        public string Day { get; set; }
+        public string Month { get; set; }
+        public string Year { get; set; }
         public string DateCreated { get; set; }
         public string DateModified { get; set; }
         public string Type { get; set; }

Models/Supply/SupplyAvailability.cs

@@ -0,0 +1,11 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyAvailability
+    {
+        public bool Missing { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public decimal Required { get; set; }
+        public decimal InStock { get; set; }
+        public bool Insufficient { get { return Required > InStock; } }
+    }
+}

Models/Supply/SupplyRequisitionHistory.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyRequisitionHistory
+    {
+        public string CostInputId { get; set; }
+        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+    }
+}

Models/Supply/SupplyStore.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyStore
+    {
+        public string Tab { get; set; }
+        public bool AdditionalSupplies { get; set; }
+    }
+}

Models/Supply/SupplyUsageHistory.cs

@@ -1,6 +1,7 @@
 namespace CarCareTracker.Models
 {
     public class SupplyUsageHistory {
+        public int Id { get; set; }
         public DateTime Date { get; set; }
         public string PartNumber { get; set; }
         public string Description { get; set; }

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -15,6 +15,7 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
+        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { 
             Id = Id, 

Models/UserConfig.cs

@@ -13,12 +13,14 @@
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
         public bool UseThreeDecimalGasCost { get; set; }
+        public bool UseThreeDecimalGasConsumption { get; set; }
         public bool UseMarkDownOnSavedNotes { get; set; }
         public bool EnableAutoReminderRefresh { get; set; }
         public bool EnableAutoOdometerInsert { get; set; }
         public bool EnableShopSupplies { get; set; }
         public bool EnableExtraFieldColumns { get; set; }
         public bool HideSoldVehicles { get; set; }
+        public bool AutomaticDecimalFormat { get; set; }
         public string PreferredGasUnit { get; set; } = string.Empty;
         public string PreferredGasMileageUnit { get; set; } = string.Empty;
         public List<UserColumnPreference> UserColumnPreferences { get; set; } = new List<UserColumnPreference>();

Program.cs

@@ -65,8 +65,8 @@ builder.Services.AddSingleton<IFileHelper, FileHelper>();
 builder.Services.AddSingleton<IGasHelper, GasHelper>();
 builder.Services.AddSingleton<IReminderHelper, ReminderHelper>();
 builder.Services.AddSingleton<IReportHelper, ReportHelper>();
-builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<IConfigHelper, ConfigHelper>();
+builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
 
 //configure logic

README.md

@@ -42,6 +42,7 @@ Read this [Getting Started Guide](https://docs.lubelogger.com/Installation/Getti
 - [Chart.js](https://github.com/chartjs/Chart.js)
 - [Drawdown](https://github.com/adamvleggett/drawdown)
 - [MailKit](https://github.com/jstedfast/MailKit)
+- [Masonry](https://github.com/desandro/masonry)
 
 ## License
 MIT

Views/API/Index.cshtml

@@ -116,6 +116,7 @@
         initialOdometer - Initial Odometer reading(optional)<br />
         odometer - Odometer reading<br />
         notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
@@ -153,6 +154,7 @@
         description - Description<br/>
         cost - Cost<br />
         notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
@@ -190,6 +192,7 @@
         description - Description<br />
         cost - Cost<br />
         notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
@@ -227,6 +230,7 @@
         description - Description<br />
         cost - Cost<br />
         notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
@@ -263,6 +267,7 @@
         description - Description<br />
         cost - Cost<br />
         notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
@@ -306,6 +311,7 @@
         isFillToFull(bool) - Filled To Full<br />
         missedFuelUp(bool) - Missed Fuel Up<br />
         notes - notes(optional)<br />
+        tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>

Views/Admin/Index.cshtml

@@ -2,12 +2,12 @@
 @{
     ViewData["Title"] = "Admin Panel";
 }
-@inject IConfiguration config;
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
     bool emailServerIsSetup = true;
-    var mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
-    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+    var mailConfig = config.GetMailConfig();
+    var userLanguage = config.GetServerLanguage();
     if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer))
     {
         emailServerIsSetup = false;

Views/Home/Index.cshtml

@@ -5,7 +5,6 @@
     var userConfig = config.GetUserConfig(User);
     var enableAuth = userConfig.EnableAuth;
     var userLanguage = userConfig.UserLanguage;
-    var logoUrl = config.GetLogoUrl();
 }
 @model string
 @{
@@ -62,7 +61,7 @@
 <div class="container">
     <div class="row mt-2">
         <div class="d-flex lubelogger-navbar">
-            <img src="@logoUrl" />
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="lubelogger-navbar-button">
                 <button type="button" class="btn btn-adaptive" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
             </div>

Views/Home/Kiosk.cshtml

@@ -0,0 +1,148 @@
+@{
+    ViewData["Title"] = "Kiosk";
+}
+@model KioskViewModel
+@section Scripts {
+    <script src="~/lib/masonry/masonry.min.js"></script>
+}
+<div class="progress" role="progressbar" aria-label="Refresh Progress" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="height: 1px">
+    <div class="progress-bar" style="width: 0%"></div>
+</div>
+<div id="kioskContainer" class="container-fluid">
+</div>
+<script>
+    let refreshTimer;
+    let exceptionList = [];
+    let subtractAmount = 0;
+    let kioskMode = '@Model.KioskMode';
+    let currentKioskMode = 'Plan';
+    let kioskWakeLock;
+
+    @foreach(int exception in Model.Exclusions)
+    {
+        @:exceptionList.push(@exception);
+    }
+
+    function initKiosk() {
+        $("body > div").removeClass("container");
+        $("body > div").css('height', '100vh');
+        subtractAmount = parseInt($("#kioskContainer").width() * 0.0016); //remove 0.0016% of width every 100 ms which will approximate to one minute.
+        if (subtractAmount < 2) {
+            subtractAmount = 2;
+        }
+        retrieveKioskContent();
+        //acquire wakeLock;
+        try {
+            navigator.wakeLock.request('screen').then((wl) => {
+                kioskWakeLock = wl;
+            });
+        } catch (err) {
+            errorToast('Location Services not Enabled');
+        }
+    }
+    function setAccessToken(accessToken){
+        //use this function to never worry about user session expiring.
+        $.ajaxSetup({
+            headers: {
+                'Authorization': `Basic ${accessToken}`
+            }
+        });
+        console.log("Access Token for Kiosk Mode Configured!");
+    }
+    function retrieveKioskContent(){
+        clearInterval(refreshTimer);
+        if (kioskMode != 'Cycle'){
+            $.post('/Home/KioskContent', { exclusions: exceptionList, kioskMode: kioskMode }, function (data) {
+                $("#kioskContainer").html(data);
+                $(".kiosk-content").masonry();
+                if ($(".no-data-message").length == 0) {
+                    $(".progress-bar").width($("#kioskContainer").width());
+                    setTimeout(function () { startTimer() }, 500);
+                }
+            });
+        } else {
+            //cycle mode
+            switch (currentKioskMode) {
+                case "Vehicle":
+                    currentKioskMode = "Reminder";
+                    break;
+                case "Reminder":
+                    currentKioskMode = "Plan";
+                    break;
+                case "Plan":
+                    currentKioskMode = "Vehicle";
+                    break;
+            }
+            $.post('/Home/KioskContent', { exclusions: exceptionList, kioskMode: currentKioskMode }, function (data) {
+                $("#kioskContainer").html(data);
+                $(".kiosk-content").masonry();
+                if ($(".no-data-message").length > 0) {
+                    //if no data on vehicle page
+                    if (currentKioskMode == "Vehicle") {
+                        return; //exit
+                    } else {
+                        retrieveKioskContent(); //skip until we hit a page with content.
+                    }
+                } else {
+                    $(".progress-bar").width($("#kioskContainer").width());
+                    setTimeout(function () { startTimer() }, 500);
+                }
+            });
+        }
+        
+    }
+    function startTimer() {
+        refreshTimer = setInterval(function () {
+            var currentWidth = $(".progress-bar").width();
+            if (currentWidth > 0) {
+                $(".progress-bar").width(currentWidth - subtractAmount);
+            } else {
+                retrieveKioskContent();
+            }
+        }, 100);
+    }
+    function addVehicleToExceptionList(vehicleId) {
+        Swal.fire({
+            title: "Remove Vehicle from Dashboard?",
+            text: "Removed vehicles can be restored by refreshing the page",
+            showCancelButton: true,
+            confirmButtonText: "Remove",
+            confirmButtonColor: "#dc3545"
+        }).then((result) => {
+            if (result.isConfirmed) {
+                exceptionList.push(vehicleId);
+                if (kioskMode == 'Cycle') {
+                    //remove the vehicle programmatically.
+                    $(`[data-vehicleId=${vehicleId}]`).remove();
+                } else {
+                    //force a refresh
+                    retrieveKioskContent();
+                }
+            }
+        });
+    }
+    function toggleReminderNote(sender){
+        var reminderNote = $(sender).find('.reminder-note');
+        if (reminderNote.text().trim() != ''){
+            if (reminderNote.hasClass('d-none')) {
+                reminderNote.removeClass('d-none');
+            } else {
+                reminderNote.addClass('d-none');
+            }
+            $(".kiosk-content").masonry();
+        }
+    }
+    function togglePlanDetails(sender) {
+        toggleReminderNote(sender);
+        var planSupplies = $(sender).find('.plan-supplies');
+        if (planSupplies.find('.plan-supply').length > 0) {
+            if (planSupplies.hasClass('d-none')) {
+                planSupplies.removeClass('d-none');
+            } else {
+                planSupplies.addClass('d-none');
+            }
+            $(".kiosk-content").masonry();
+        }
+    }
+    initKiosk();
+</script>

Views/Home/Privacy.cshtml

@@ -1,6 +0,0 @@
-@{
-    ViewData["Title"] = "Privacy Policy";
-}
-<h1>@ViewData["Title"]</h1>
-
-<p>Use this page to detail your site's privacy policy.</p>

Views/Home/_Kiosk.cshtml

@@ -0,0 +1,126 @@
+@using CarCareTracker.Helper
+@model List<VehicleInfo>
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@if (Model.Any())
+{
+    <div class="row row-cols-1 row-cols-md-3 g-4 mt-1 kiosk-content" data-masonry='{"percentPosition": true }'>
+        @foreach (VehicleInfo vehicle in Model)
+        {
+            <div class="col" data-vehicleId="@vehicle.VehicleData.Id">
+                <div class="card" onclick="addVehicleToExceptionList(@vehicle.VehicleData.Id)">
+                    <div class="card-body" style="padding-top:0.25rem; padding-bottom:0.25rem;">
+                        <h5 class="card-title">@($"{vehicle.VehicleData.Year} {vehicle.VehicleData.Make} {vehicle.VehicleData.Model} ({StaticHelper.GetVehicleIdentifier(vehicle.VehicleData)})")</h5>
+                        <div class="row">
+                            <div class="col-3 text-center">
+                                <p class="display-7">@vehicle.ServiceRecordCount</p>
+                                <p class="lead text-truncate">@translator.Translate(userLanguage, "Service")</p>
+                                <p class="lead text-truncate">@vehicle.ServiceRecordCost.ToString("C0")</p>
+                            </div>
+                            <div class="col-3 text-center">
+                                <p class="display-7">@vehicle.RepairRecordCount</p>
+                                <p class="lead text-truncate">@translator.Translate(userLanguage, "Repairs")</p>
+                                <p class="lead text-truncate">@vehicle.RepairRecordCost.ToString("C0")</p>
+                            </div>
+                            <div class="col-3 text-center">
+                                <p class="display-7">@vehicle.UpgradeRecordCount</p>
+                                <p class="lead text-truncate">@translator.Translate(userLanguage, "Upgrades")</p>
+                                <p class="lead text-truncate">@vehicle.UpgradeRecordCost.ToString("C0")</p>
+                            </div>
+                            <div class="col-3 text-center">
+                                <p class="display-7">@vehicle.GasRecordCount</p>
+                                <p class="lead text-truncate">@translator.Translate(userLanguage, "Fuel")</p>
+                                <p class="lead text-truncate">@vehicle.GasRecordCost.ToString("C0")</p>
+                            </div>
+                        </div>
+                    </div>
+                    @if (vehicle.PastDueReminderCount + vehicle.VeryUrgentReminderCount + vehicle.UrgentReminderCount + vehicle.NotUrgentReminderCount > 0)
+                    {
+                        <hr style="margin:0px;" />
+                        <div class="card-body" style="padding-top:0.25rem; padding-bottom:0.25rem;">
+                            <h5 class="card-title">@translator.Translate(userLanguage, "Reminders")</h5>
+                            <div class="row">
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.PastDueReminderCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Past Due")</p>
+                                </div>
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.VeryUrgentReminderCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Very Urgent")</p>
+                                </div>
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.UrgentReminderCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Urgent")</p>
+                                </div>
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.NotUrgentReminderCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Not Urgent")</p>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    @if (vehicle.NextReminder != null)
+                    {
+                        <hr style="margin:0px;" />
+                        <div class="card-body" style="padding-top:0.25rem; padding-bottom:0.25rem;">
+                            <h5 class="card-title">@translator.Translate(userLanguage, "Upcoming Reminder")</h5>
+                            <div class="row">
+                                <div class="col-12">
+                                    <p class="display-7">@vehicle.NextReminder.Description</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, StaticHelper.GetTitleCaseReminderUrgency(vehicle.NextReminder.Urgency))</p>
+                                    <div class="row">
+                                        @if (vehicle.NextReminder.Metric == "Date" || vehicle.NextReminder.Metric == "Both")
+                                        {
+                                            <div class="col-6"><i class='bi bi-calendar-event me-2'></i>@vehicle.NextReminder.DueDate</div>
+                                        }
+                                        @if (vehicle.NextReminder.Metric == "Odometer" || vehicle.NextReminder.Metric == "Both")
+                                        {
+                                            <div class="col-6"><i class='bi bi-speedometer me-2'></i>@vehicle.NextReminder.DueOdometer</div>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    @if (vehicle.PlanRecordBackLogCount + vehicle.PlanRecordInProgressCount + vehicle.PlanRecordTestingCount + vehicle.PlanRecordBackLogCount > 0)
+                    {
+                        <hr style="margin:0px;" />
+                        <div class="card-body" style="padding-top:0.25rem; padding-bottom:0.25rem;">
+                            <h5 class="card-title">@translator.Translate(userLanguage, "Plans")</h5>
+                            <div class="row">
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.PlanRecordBackLogCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Planned")</p>
+                                </div>
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.PlanRecordInProgressCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Doing")</p>
+                                </div>
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.PlanRecordTestingCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Testing")</p>
+                                </div>
+                                <div class="col-3 text-center">
+                                    <p class="display-7">@vehicle.PlanRecordDoneCount</p>
+                                    <p class="lead text-wrap">@translator.Translate(userLanguage, "Done")</p>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        }
+    </div>
+}
+else
+{
+    <div class="row no-data-message">
+        <div class="col">
+            <span class="display-3">@translator.Translate(userLanguage, "No records available to display")</span>
+        </div>
+    </div>
+}

Views/Home/_KioskPlan.cshtml

@@ -0,0 +1,86 @@
+@using CarCareTracker.Helper
+@model List<PlanRecord>
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@if (Model.Any())
+{
+    <div class="row row-cols-1 row-cols-md-3 g-4 mt-1 kiosk-content" data-masonry='{"percentPosition": true }'>
+        @foreach (PlanRecord plan in Model)
+        {
+            <div class="col" onclick="togglePlanDetails(this)">
+                <div class="card @StaticHelper.GetPlanRecordColor(plan.Priority)">
+                    <div class="card-body" style="padding-top:0.25rem; padding-bottom:0.25rem;">
+                        <h5 class="card-title">@plan.Description</h5>
+                        <div class="row">
+                            <div class="col-12">
+                                <p class="display-7 d-none reminder-note" style="white-space: pre-wrap">@plan.Notes</p>
+                                <p class="lead text-wrap">@translator.Translate(userLanguage, StaticHelper.GetPlanRecordProgress(plan.Progress))</p>
+                                <div class="row">
+                                    <div class="col-6">
+                                        @if (plan.ImportMode == ImportMode.ServiceRecord)
+                                        {
+                                            <span class="lead">@translator.Translate(userLanguage, "Service")</span>
+                                        }
+                                        else if (plan.ImportMode == ImportMode.UpgradeRecord)
+                                        {
+                                            <span class="lead">@translator.Translate(userLanguage, "Repairs")</span>
+                                        }
+                                        else if (plan.ImportMode == ImportMode.RepairRecord)
+                                        {
+                                            <span class="lead">@translator.Translate(userLanguage, "Upgrades")</span>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    @if (plan.RequisitionHistory.Any())
+                    {
+                        <ul class="list-group list-group-flush plan-supplies d-none">
+                            <li class="list-group-item">
+                                <div class="row">
+                                    <div class="col-4">
+                                        @translator.Translate(userLanguage, "Part Number")
+                                    </div>
+                                    <div class="col-4">
+                                        @translator.Translate(userLanguage, "Description")
+                                    </div>
+                                    <div class="col-4">
+                                        @translator.Translate(userLanguage, "Quantity")
+                                    </div>
+                                </div>
+                            </li>
+                            @foreach (SupplyUsageHistory supply in plan.RequisitionHistory)
+                            {
+                                <li class="list-group-item plan-supply">
+                                    <div class="row">
+                                        <div class="col-4">
+                                            @supply.PartNumber
+                                        </div>
+                                        <div class="col-4">
+                                            @supply.Description
+                                        </div>
+                                        <div class="col-4">
+                                            @supply.Quantity
+                                        </div>
+                                    </div>
+                                </li>
+                            }
+                        </ul>
+                    }
+                </div>
+            </div>
+        }
+    </div>
+} else
+{
+    <div class="row no-data-message">
+        <div class="col">
+            <span class="display-3">@translator.Translate(userLanguage, "No records available to display")</span>
+        </div>
+    </div>
+}

Views/Home/_KioskReminder.cshtml

@@ -0,0 +1,47 @@
+@using CarCareTracker.Helper
+@model List<ReminderRecordViewModel>
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@if (Model.Any())
+{
+    <div class="row row-cols-1 row-cols-md-3 g-4 mt-1 kiosk-content" data-masonry='{"percentPosition": true }'>
+        @foreach (ReminderRecordViewModel reminder in Model)
+        {
+            <div class="col" onclick="toggleReminderNote(this)">
+                <div class="card @StaticHelper.GetReminderUrgencyColor(reminder.Urgency)">
+                    <div class="card-body" style="padding-top:0.25rem; padding-bottom:0.25rem;">
+                        <h5 class="card-title">@reminder.Description</h5>
+                        <div class="row">
+                            <div class="col-12">
+                                <p class="display-7 d-none reminder-note" style="white-space: pre-wrap">@reminder.Notes</p>
+                                <p class="lead text-wrap">@translator.Translate(userLanguage, StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency))</p>
+                                <div class="row">
+                                    @if (reminder.Metric == ReminderMetric.Date || reminder.Metric == ReminderMetric.Both)
+                                    {
+                                        <div class="col-6"><i class='bi bi-calendar-event me-2'></i>@reminder.Date.ToShortDateString()</div>
+                                    }
+                                    @if (reminder.Metric == ReminderMetric.Odometer || reminder.Metric == ReminderMetric.Both)
+                                    {
+                                        <div class="col-6"><i class='bi bi-speedometer me-2'></i>@reminder.Mileage</div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        }
+    </div>
+}
+else
+{
+    <div class="row no-data-message">
+        <div class="col">
+            <span class="display-3">@translator.Translate(userLanguage, "No records available to display")</span>
+        </div>
+    </div>
+}

Views/Home/_Settings.cshtml

@@ -37,14 +37,24 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useDescending" checked="@Model.UserConfig.UseDescending">
             <label class="form-check-label" for="useDescending">@translator.Translate(userLanguage, "Sort lists in Descending Order(Newest to Oldest)")</label>
         </div>
-        <div class="form-check form-switch">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.UserConfig.HideZero">
-            <label class="form-check-label" for="hideZero">@translator.Translate(userLanguage, "Replace $0.00 Costs with ---")</label>
+        <div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.UserConfig.HideZero">
+                <label class="form-check-label" for="hideZero">@translator.Translate(userLanguage, "Replace $0.00 Costs with ---")</label>
+            </div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="automaticDecimalFormat" checked="@Model.UserConfig.AutomaticDecimalFormat">
+                <label class="form-check-label" for="automaticDecimalFormat">@translator.Translate(userLanguage, "Automatically Format Decimal Inputs")</label>
+            </div>
         </div>
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UserConfig.UseThreeDecimalGasCost">
             <label class="form-check-label" for="useThreeDecimal">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Cost")</label>
         </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimalGasConsumption" checked="@Model.UserConfig.UseThreeDecimalGasConsumption">
+            <label class="form-check-label" for="useThreeDecimalGasConsumption">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Consumption")</label>
+        </div>
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useMarkDownOnSavedNotes" checked="@Model.UserConfig.UseMarkDownOnSavedNotes">
             <label class="form-check-label" for="useMarkDownOnSavedNotes">@translator.Translate(userLanguage, "Display Saved Notes in Markdown")</label>
@@ -61,13 +71,15 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableExtraFieldColumns" checked="@Model.UserConfig.EnableExtraFieldColumns">
             <label class="form-check-label" for="enableExtraFieldColumns">@translator.Translate(userLanguage, "Show Extra Field Columns")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Enabling this may cause performance issues")</small></label>
         </div>
-        <div class="form-check form-switch">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
-            <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
-        </div>
-        <div class="form-check form-switch @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
-            <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
+        <div>
+            <div class="form-check form-switch form-check-inline">
+                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
+                <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
+            </div>
+            <div class="form-check form-switch form-check-inline @(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>
         </div>
         @if (User.IsInRole(nameof(UserData.IsRootUser)))
         {
@@ -308,6 +320,7 @@
             <li class="list-group-item">Chart.js</li>
             <li class="list-group-item">Drawdown</li>
             <li class="list-group-item">MailKit</li>
+            <li class="list-group-item">Masonry</li>
         </ul>
     </div>
 </div>
@@ -330,6 +343,12 @@
         </div>
     </div>
 </div>
+<div class="modal fade" data-bs-focus="false" id="customWidgetModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="customWidgetModalContent">
+        </div>
+    </div>
+</div>
 <div class="modal fade" data-bs-focus="false" id="tabReorderModal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="tabReorderModalContent">

Views/Home/_TranslationEditor.cshtml

@@ -1,10 +1,12 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
 @inject ITranslationHelper translator
+@inject IConfiguration serverConfig;
 @model Dictionary<string, string>
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    bool showDelete = bool.Parse(serverConfig["LUBELOGGER_TRANSLATOR"] ?? "false");
 }
 <div class="modal-header">
     <h5 class="modal-title" id="translationEditorModalLabel">@translator.Translate(userLanguage, "Translation Editor")</h5>
@@ -15,8 +17,15 @@
         <div class="form-group" style="max-height:50vh; overflow-x:hidden; overflow-y:scroll;">
             @foreach(var translation in Model)
             {
-                <div class="row translation-keyvalue mb-2">
-                    <div class="col-md-6 col-12 translation-key">@translation.Key.Replace("_", " ")</div>
+                <div class="row translation-keyvalue mb-2 align-items-center">
+                    @if (showDelete)
+                    {
+                        <div class="col-md-1 col-1 translation-delete"><button onclick="deleteTranslationKey(this)" class="btn text-danger btn-sm"><i class="bi bi-x-lg"></i></button></div>
+                        <div class="col-md-5 col-11 translation-key">@translation.Key.Replace("_", " ")</div>
+                    } else
+                    {
+                        <div class="col-md-6 col-12 translation-key">@translation.Key.Replace("_", " ")</div>
+                    }
                     <div class="col-md-6 col-12 translation-value">
                         <textarea style="height:100%;width:98%;" class="form-control" placeholder="@translation.Value">@translation.Value</textarea>
                     </div>

Views/Home/_VehicleSelector.cshtml

@@ -0,0 +1,26 @@
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@using CarCareTracker.Helper
+@model List<Vehicle>
+
+@{
+    var userLanguage = config.GetUserConfig(User).UserLanguage;
+}
+
+@if (Model.Any())
+{
+    <div id="vehicleSelector">
+        <ul class="list-group">
+            @foreach (Vehicle vehicle in Model)
+            {
+                <li class="list-group-item text-start">
+                    <input class="form-check-input" type="checkbox" value="@vehicle.Id" id="vehicleCheck_@vehicle.Id">
+                    <label class="form-check-label stretched-link" for="vehicleCheck_@vehicle.Id">@($"{vehicle.Year} {vehicle.Make} {vehicle.Model} ({StaticHelper.GetVehicleIdentifier(vehicle)})")</label>
+                </li>
+            }
+        </ul>
+    </div>
+} else
+{
+    <div id="vehicleSelector"><span class="lead">@translator.Translate(userLanguage, "No Vehicles Available")</span></div>
+}

Views/Home/_WidgetEditor.cshtml

@@ -0,0 +1,28 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model string
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title" id="widgetEditorModalLabel">@translator.Translate(userLanguage, "Custom Widgets Editor")</h5>
+    <button type="button" class="btn-close" onclick="hideCustomWidgets()" aria-label="Close"></button>
+</div>
+<div class="modal-body" onkeydown="handleEnter(this)">
+    <form class="form-inline">
+        <div class="form-group" style="height:50vh; overflow-x:hidden; overflow-y:auto;">
+            <div class="row">
+                <div class="col-12" style="height:48vh;">
+                    <textarea id="widgetEditor" style="width:100%; height:100%;">@Model</textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-danger me-auto" onclick="deleteCustomWidgets()">@translator.Translate(userLanguage, "Delete")</button>
+    <button type="button" class="btn btn-secondary" onclick="hideCustomWidgets()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" class="btn btn-primary" onclick="saveCustomWidgets()">@translator.Translate(userLanguage, "Save")</button>
+</div>

Views/Login/ForgotPassword.cshtml

@@ -2,7 +2,6 @@
 @inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
 }
 @{
@@ -14,7 +13,7 @@
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div>
         <div style="max-width:204px;">
-            <img src="@logoUrl" />
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
                 <input type="text" id="inputUserName" class="form-control">

Views/Login/Index.cshtml

@@ -3,7 +3,6 @@
 @inject ITranslationHelper translator
 @model string
 @{
-    var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
     var registrationDisabled = config.GetServerDisabledRegistration();
     var openIdConfigName = config.GetOpenIDConfig().Name;
@@ -17,7 +16,7 @@
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div>
         <div style="max-width:204px;">
-            <img src="@logoUrl" />
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
                 <input type="text" id="inputUserName" class="form-control">

Views/Login/OpenIDRegistration.cshtml

@@ -2,7 +2,6 @@
 @inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
 }
 @model string
@@ -15,7 +14,7 @@
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div>
         <div style="max-width:204px;">
-            <img src="@logoUrl" />
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
                 <input type="text" id="inputToken" class="form-control">

Views/Login/Registration.cshtml

@@ -2,7 +2,6 @@
 @inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
 }
 @{
@@ -14,7 +13,7 @@
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div>
         <div style="max-width:204px;">
-            <img src="@logoUrl" />
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
                 <input type="text" id="inputToken" class="form-control">

Views/Login/ResetPassword.cshtml

@@ -2,7 +2,6 @@
 @inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
 }
 @{
@@ -14,7 +13,7 @@
 <div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div>
         <div style="max-width:204px;">
-            <img src="@logoUrl" />
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
                 <input type="text" id="inputToken" class="form-control">

Views/Migration/Index.cshtml

@@ -1,12 +1,12 @@
-@using CarCareTracker.Helper
-@{
+@{
     ViewData["Title"] = "Database Migration";
 }
-@inject IConfiguration config;
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+    var userLanguage = config.GetServerLanguage();
 }
+@using CarCareTracker.Helper
 @model AdminViewModel
 <div class="container">
     <div class="row">
@@ -21,9 +21,9 @@
     <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>
+                <li class="list-group-item">@translator.Translate(userLanguage, "Instructions")</li>
+                <li class="list-group-item">@translator.Translate(userLanguage, "Use this tool to migrate data between LiteDB and Postgres")</li>
+                <li class="list-group-item">@translator.Translate(userLanguage, "Note that it is recommended that the Postgres DB is empty when importing from LiteDB to prevent primary key errors.")</li>
             </ul>
         </div>
     </div>

Views/Shared/_Layout.cshtml

@@ -1,4 +1,5 @@
 @using CarCareTracker.Helper
+@using System.Globalization
 <!DOCTYPE html>
 @inject IConfigHelper config
 @inject ITranslationHelper translator
@@ -10,9 +11,10 @@
     var useMPG = userConfig.UseMPG;
     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 automaticDecimalFormat = userConfig.AutomaticDecimalFormat;
+    var shortDatePattern = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+    var firstDayOfWeek = (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
+    var numberFormat = CultureInfo.CurrentCulture.NumberFormat;
     var userLanguage = userConfig.UserLanguage;
     shortDatePattern = shortDatePattern.ToLower();
     if (!shortDatePattern.Contains("dd"))
@@ -90,6 +92,42 @@
             input = input.replace(".", decimalSeparator);
             return input;
         }
+        function fixDecimalInput(input, numOfDecimals) {
+            if ("@automaticDecimalFormat" == "True") {
+                //get the decimal separator.
+                var decimalSeparator = decodeHTMLEntities("@numberFormat.NumberDecimalSeparator");
+                var inputText = $(input).val().trim();
+                inputText = inputText.replace(decimalSeparator, '');
+                inputText = +inputText;
+                if (isNaN(inputText)){
+                    return;
+                }
+                inputText = inputText.toString();
+                if (inputText == '') {
+                    return;
+                };
+                //check number of decimals.
+                if (inputText.length <= numOfDecimals) {
+                    //less than number of decimals, assume everything is behind the decimal.
+                    inputText = `0${decimalSeparator}${inputText}`; //add leading zero.
+                    $(input).val(inputText);
+                } else {
+                    //check if leading zero
+                    var charToSlice = numOfDecimals * -1;
+                    var charsBehindDecimal = inputText.slice(charToSlice);
+                    var charsFrontDecimal = inputText.substr(0, inputText.length - numOfDecimals);
+                    inputText = `${charsFrontDecimal}${decimalSeparator}${charsBehindDecimal}`;
+                    $(input).val(inputText);
+                }
+            }
+        }
+        function interceptDecimalKeys(event) {
+            if ("@automaticDecimalFormat" == "True") {
+                if (event.which == 190 || event.which == 188) {
+                    event.preventDefault(); //intercept keys.
+                }
+            }
+        }
         function genericErrorMessage(){
             return decodeHTMLEntities('@translator.Translate(userLanguage, "An error has occurred, please try again later")');
         }

Views/Vehicle/_Collaborators.cshtml

@@ -42,6 +42,7 @@
     function deleteCollaborator(userId, vehicleId) {
         $.post('/Vehicle/DeleteCollaboratorFromVehicle', {userId: userId, vehicleId: vehicleId}, function(data){
             if (data) {
+                successToast('Collaborator Removed');
                 refreshCollaborators();
             } else {
                 errorToast(genericErrorMessage());
@@ -68,6 +69,7 @@
                 var vehicleId = GetVehicleId().vehicleId;
                 $.post('/Vehicle/AddCollaboratorsToVehicle', { username: result.value.userName, vehicleId: vehicleId }, function (data) {
                     if (data.success) {
+                        successToast(data.message);
                         refreshCollaborators();
                     } else {
                         errorToast(data.message)

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -43,11 +43,8 @@
                         </div>
                     }
                     <label for="collisionRecordCost">@translator.Translate(userLanguage, "Cost")</label>
-                    <input type="text" inputmode="decimal" id="collisionRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the repair")" value="@(isNew ? "" : Model.Cost)">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "RepairRecord")
-                    }
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="collisionRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the repair")" value="@(isNew ? "" : Model.Cost)">
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "RepairRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="collisionRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="collisionRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -126,7 +123,7 @@
         <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Repair Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "collisionRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_CollisionRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage,"Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('accident-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">               
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -101,7 +108,7 @@
     <div class="col-12">
         <div class="row mt-2 showOnPrint">
             <div class="d-flex">
-                <img src="/defaults/lubelogger_logo.png" />
+                <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             </div>
         </div>
         <table class="table table-hover">
@@ -125,8 +132,8 @@
                         <td class="col-2 col-xl-1 flex-grow-1 text-truncate" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(collisionRecord.Date)">@collisionRecord.Date.ToShortDateString()</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())</td>
                         <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description">@collisionRecord.Description</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(collisionRecord.Cost, hideZero))</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
                             <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
@@ -134,7 +141,7 @@
                                     var extraFieldValue = collisionRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
                                     if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
                                     {
-                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue)</a>
+                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@StaticHelper.TruncateStrings(extraFieldValue)</a>
                                     }
                                     else
                                     {
@@ -146,6 +153,13 @@
                     </tr>
                 }
             </tbody>
+            <tfoot>
+                <tr class="d-flex">
+                    <td class="col-12 showOnPrint lubelogger-report-banner">
+                        @StaticHelper.ReportNote
+                    </td>
+                </tr>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -159,20 +173,21 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleRecords(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Move To")</h6></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'ServiceRecord')">@translator.Translate(userLanguage, "Service Records")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'UpgradeRecord')">@translator.Translate(userLanguage, "Upgrades")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'ServiceRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Service Records")</span><i class="bi bi-card-checklist"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="moveRecords(selectedRow, 'RepairRecord', 'UpgradeRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Upgrades")</span><i class="bi bi-wrench-adjustable"></i></div></a></li>
     <li><hr class="dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-active-multiple dropdown-divider"></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)">@translator.Translate(userLanguage, "Statistics")</a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="getRecordsDeltaStats(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Statistics")</span><i class="bi bi-graph-up"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'RepairRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'RepairRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_CostDistanceTableReport.cshtml

@@ -0,0 +1,94 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model CostDistanceTableForVehicle
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+    var hideZero = userConfig.HideZero;
+    var years = Model.CostData.Select(x => x.Year).OrderByDescending(x => x).Distinct();
+    var months = Model.CostData.OrderBy(x => x.MonthId).Select(x => x.MonthName).Distinct();
+}
+@if (Model.CostData.Any())
+{
+    <div>
+        <div class="modal-header">
+            <h5 class="modal-title">@(translator.Translate(userLanguage, "Vehicle Monthly Cost Breakdown"))</h5>
+            <button type="button" class="btn-close" onclick="hideDataTable()" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+            <div class="row">
+                <div class="col-12" style="overflow-x:auto;">
+                    <table class="table table-hover">
+                        <thead class="sticky-top">
+                            <tr class="d-flex">
+                                <th scope="col" style="cursor:pointer;" onclick="toggleBarChartTableData()" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@(translator.Translate(userLanguage, "Year"))</th>
+                                @foreach(int year in years){
+                                    if (year != default){
+                                        <th scope="col" style="cursor:pointer;" onclick="toggleBarChartTableData()" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@year</th>
+                                    }
+                                }
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach(string month in months){
+                                <tr class="d-flex">
+                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@month</td>
+                                    @foreach(int year in years){
+                                        if (year != default){
+                                            {
+                                                var dataToDisplay = Model.CostData.Where(x => x.Year == year && x.MonthName == month).FirstOrDefault();
+                                                if (dataToDisplay != null && dataToDisplay != default)
+                                                {
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(dataToDisplay.Cost.ToString("C2"), hideZero))</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@(dataToDisplay.DistanceTraveled != default ? $"{dataToDisplay.DistanceTraveled.ToString("N0")} {Model.DistanceUnit}" : "---")</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@(StaticHelper.HideZeroCost(dataToDisplay.CostPerDistanceTraveled.ToString("C2"), hideZero, $"/{Model.DistanceUnit}"))</td>
+                                                } else {
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero))</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@("---")</td>
+                                                    <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@($"{StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero, $"/{Model.DistanceUnit}")}")</td>
+                                                }
+                                            }
+                                            }
+                                        }
+                                    </tr>
+                                }
+                        </tbody>
+                        <tfoot>
+                            <tr class="d-flex fw-bold">
+                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@(translator.Translate(userLanguage, "Total"))</td>
+                                @foreach (int year in years)
+                                {
+                                    if (year != default)
+                                    {
+                                        {
+                                            var yearDataToDisplay = Model.CostData.Where(x => x.Year == year);
+                                            if (yearDataToDisplay != null && yearDataToDisplay != default)
+                                            {
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(yearDataToDisplay.Sum(x => x.Cost).ToString("C2"), hideZero))</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@(yearDataToDisplay.Sum(x => x.DistanceTraveled) != default ? $"{yearDataToDisplay.Sum(x => x.DistanceTraveled).ToString("N0")} {Model.DistanceUnit}" : "---")</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@(StaticHelper.HideZeroCost(yearDataToDisplay.Sum(x => x.CostPerDistanceTraveled).ToString("C2"), hideZero, $"/{Model.DistanceUnit}"))</td>
+                                            }                              
+                                            else                           
+                                            {                              
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" report-data="cost">@(StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero))</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="distance">@("---")</td>
+                                                <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate d-none" report-data="costperdistance">@($"{StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero)}")</td>
+                                            }
+                                        }
+                                    }
+                                }
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+else
+{
+    <div class="text-center">
+        <h4>@translator.Translate(userLanguage, "No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.")</h4>
+    </div>
+}

Views/Vehicle/_CostMakeUpReport.cshtml

@@ -16,28 +16,33 @@
             new Chart($("#pie-chart"), {
                 type: 'pie',
                 data: {
-                    labels: [decodeHTMLEntities('@translator.Translate(userLanguage, "Service Records")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Repairs")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Upgrades")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Tax")'),
-                    decodeHTMLEntities('@translator.Translate(userLanguage, "Fuel")')],
+                    labels: [
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Service Records")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Repairs")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Upgrades")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Fuel")'),
+                        decodeHTMLEntities('@translator.Translate(userLanguage, "Tax")')
+                    ],
                     datasets: [
                         {
                             label: decodeHTMLEntities('@translator.Translate(userLanguage, "Expenses by Type")'),
-                            backgroundColor: ["#003f5c", "#58508d", "#bc5090", "#ff6361", "#ffa600"],
+                            backgroundColor: ["#003f5c", "#58508d", "#bc5090", "#ffa600", "#ff6361" ],
                             data: [
                                 globalParseFloat('@Model.ServiceRecordSum'),
                                 globalParseFloat('@Model.CollisionRecordSum'),
                                 globalParseFloat('@Model.UpgradeRecordSum'),
-                                globalParseFloat('@Model.TaxRecordSum'),
-                                globalParseFloat('@Model.GasRecordSum')
+                                globalParseFloat('@Model.GasRecordSum'),
+                                globalParseFloat('@Model.TaxRecordSum')
                             ]
                         }
                     ]
                 },
                 options: {
-                    onClick: (e) => {
-                        showDataTable();
+                    onClick: (e, a, c) => {
+                        showDataTable(a);
+                    },
+                    onHover: (e, a, c) => {
+                        a.length > 0 ? c.canvas.style.cursor = 'pointer' : c.canvas.style.cursor = 'default';
                     },
                     plugins: {
                         legend: {

Views/Vehicle/_CostTableReport.cshtml

@@ -27,43 +27,45 @@
                             </tr>
                         </thead>
                         <tbody>
-                                <tr class="d-flex">
-                                    <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Service Records")</td>
-                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordPerDay == default ? "---" : Model.ServiceRecordPerDay.ToString("C2"))</td>
-                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordPerMile == default ? "---" :Model.ServiceRecordPerMile.ToString("C2"))</td>
-                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordSum == default ? "---" :Model.ServiceRecordSum.ToString("C2"))</td>
-                                </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Service Records")</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.ServiceRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.ServiceRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.ServiceRecordSum.ToString("C2"), hideZero))</td>
+                            </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Repairs")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordPerDay == default ? "---" :Model.CollisionRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordPerMile == default ? "---" :Model.CollisionRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordSum == default ? "---" :Model.CollisionRecordSum.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.CollisionRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.CollisionRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.CollisionRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Upgrades")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordPerDay == default ? "---" :Model.UpgradeRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordPerMile == default ? "---" :Model.UpgradeRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordSum == default ? "---" :Model.UpgradeRecordSum.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.UpgradeRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.UpgradeRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.UpgradeRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Fuel")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordPerDay == default ? "---" :Model.GasRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordPerMile == default ? "---" :Model.GasRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordSum == default ? "---" :Model.GasRecordSum.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.GasRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.GasRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.GasRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                             <tr class="d-flex">
                                 <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Taxes")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordPerDay == default ? "---" :Model.TaxRecordPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordPerMile == default ? "---" : Model.TaxRecordPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordSum == default ? "---" :Model.TaxRecordSum.ToString("C2"))</td>
-                            </tr>
-                            <tr class="d-flex">
-                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Total")</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalPerDay == default ? "---" : Model.TotalPerDay.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalPerMile == default ? "---" : Model.TotalPerMile.ToString("C2"))</td>
-                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalCost == default ? "---" : Model.TotalCost.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TaxRecordPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TaxRecordPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TaxRecordSum.ToString("C2"), hideZero))</td>
                             </tr>
                         </tbody>
+                        <tfoot>
+                            <tr class="d-flex fw-bold">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Total")</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TotalPerDay.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TotalPerMile.ToString("C2"), hideZero))</td>
+                                <td class="col-3 flex-grow-1">@(StaticHelper.HideZeroCost(Model.TotalCost.ToString("C2"), hideZero))</td>
+                            </tr>
+                        </tfoot>
                     </table>
                 </div>
             </div>

Views/Vehicle/_Gas.cshtml

@@ -10,7 +10,9 @@
     var useUKMPG = userConfig.UseUKMPG;
     var hideZero = userConfig.HideZero;
     var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var useThreeDecimalsConsumption = userConfig.UseThreeDecimalGasConsumption;
     var gasCostFormat = useThreeDecimals ? "C3" : "C2";
+    var gasConsumptionFormat = useThreeDecimalsConsumption ? "F3" : "F2";
     var userLanguage = userConfig.UserLanguage;
     var useKwh = Model.UseKwh;
     var useHours = Model.UseHours;
@@ -66,7 +68,7 @@
                     <span class="ms-2 badge bg-primary" id="maxFuelMileageLabel">@($"{translator.Translate(userLanguage, "Max Fuel Economy")}: {Model.GasRecords.Where(y => y.MilesPerGallon > 0)?.Min(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
                 }
             }
-            <span class="ms-2 badge bg-success">@($"{translator.Translate(userLanguage, "Total Fuel Consumed")}: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
+            <span class="ms-2 badge bg-success" id="totalFuelConsumedLabel">@($"{translator.Translate(userLanguage, "Total Fuel Consumed")}: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
             <span class="ms-2 badge bg-success" data-aggregate-type="sum">@($"{translator.Translate(userLanguage, "Total Cost")}: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
             @foreach (string recordTag in recordTags)
             {
@@ -93,6 +95,13 @@
                     <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                     <li><a class="dropdown-item" href="#" onclick="searchGasTableRows()">@translator.Translate(userLanguage, "Search")</a></li>
                     <li><hr class="dropdown-divider"></li>
+                    <li>
+                        <div class="list-group-item">
+                            <input class="btn-check" type="checkbox" id="chkSelectMode">
+                            <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                        </div>
+                    </li>
+                    <li><hr class="dropdown-divider"></li>
                     <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                     <li class="dropdown-item">
                         <div class="list-group-item">
@@ -165,7 +174,7 @@
     <div class="col-12">
         <div class="row mt-2 showOnPrint">
             <div class="d-flex">
-                <img src="/defaults/lubelogger_logo.png" />
+                <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             </div>
         </div>
         <table class="table table-hover">
@@ -192,7 +201,7 @@
                         <td class="col-2 flex-grow-1 text-truncate" data-column="daterefueled">@gasRecord.Date</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@(gasRecord.Mileage == default ? "---" : gasRecord.Mileage.ToString())</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="delta">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString(gasConsumptionFormat)</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="fueleconomy" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" data-column="unitcost" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
@@ -204,7 +213,7 @@
                                     var extraFieldValue = gasRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
                                     if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
                                     {
-                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue)</a>
+                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@StaticHelper.TruncateStrings(extraFieldValue)</a>
                                     }
                                     else
                                     {
@@ -216,6 +225,13 @@
                     </tr>
                 }
             </tbody>
+            <tfoot>
+                <tr class="d-flex">
+                    <td class="col-12 showOnPrint lubelogger-report-banner">
+                        @StaticHelper.ReportNote
+                    </td>
+                </tr>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -229,14 +245,15 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleGasRecords(selectedRow)">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleGasRecords(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_GasCostByMonthReport.cshtml

@@ -52,6 +52,12 @@
                         ]
                     },
                     options: {
+                        onClick: (e, a, c) => {
+                            showBarChartTable(a);
+                        },
+                        onHover: (e, a, c) => {
+                            a.length > 0 ? c.canvas.style.cursor = 'pointer' : c.canvas.style.cursor = 'default';
+                        },
                         plugins: {
                             title: {
                                 display: true,

Views/Vehicle/_GasModal.cshtml

@@ -7,6 +7,8 @@
     var useMPG = userConfig.UseMPG;
     var useUKMPG = userConfig.UseUKMPG;
     var userLanguage = userConfig.UserLanguage;
+    var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var useThreeDecimalsConsumption = userConfig.UseThreeDecimalGasConsumption;
     var useKwh = Model.UseKwh;
     var useHours = Model.UseHours;
     var isNew = Model.GasRecord.Id == 0;
@@ -62,7 +64,7 @@
                         }
                     </div>
                     <label for="gasRecordGallons">@($"{translator.Translate(userLanguage, "Fuel Consumption")}({consumptionUnit})")</label>
-                    <input type="text" inputmode="decimal" id="gasRecordGallons" class="form-control" placeholder="@translator.Translate(userLanguage,"Amount of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Gallons)">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimalsConsumption ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" 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>
@@ -75,7 +77,7 @@
                     @if (isNew)
                     {
                         <div class="input-group">
-                            <input type="text" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                            <input type="text" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimals ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" 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>
@@ -85,7 +87,7 @@
                         </div>
                     } else
                     {
-                        <input type="text" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of gas refueled")" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                        <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimals ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" 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">

Views/Vehicle/_GasRecordsModal.cshtml

@@ -5,6 +5,8 @@
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var useThreeDecimalsConsumption = userConfig.UseThreeDecimalGasConsumption;
 }
 <div class="modal-header">
     <h5 class="modal-title">@translator.Translate(userLanguage,"Edit Multiple Gas Records")</h5>
@@ -23,9 +25,9 @@
                     <label for="gasRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
                     <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="gasRecordConsumption">@translator.Translate(userLanguage, "Fuel Consumption")</label>
-                    <input type="text" inputmode="decimal" id="gasRecordConsumption" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimalsConsumption ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" id="gasRecordConsumption" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="gasRecordCost">@translator.Translate(userLanguage, "Cost")</label>
-                    <input type="text" inputmode="decimal" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="@(useThreeDecimals ? "fixDecimalInput(this, 3)" : "fixDecimalInput(this, 2)")" id="gasRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="gasRecordTag">@translator.Translate(userLanguage, "Tags(use --- to clear all existing tags)")</label>
                     <select multiple class="form-select" id="gasRecordTag"></select>
                     @foreach (ExtraField field in Model.EditRecord.ExtraFields)

Views/Vehicle/_GenericRecordModal.cshtml

@@ -25,7 +25,7 @@
                     <label for="genericRecordDescription">@translator.Translate(userLanguage, "Description")</label>
                     <input type="text" id="genericRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="genericRecordCost">@translator.Translate(userLanguage, "Cost")</label>
-                    <input type="text" inputmode="decimal" id="genericRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="genericRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"(multiple)")">
                     <label for="genericRecordTag">@translator.Translate(userLanguage, "Tags(use --- to clear all existing tags)")</label>
                     <select multiple class="form-select" id="genericRecordTag"></select>
                     @foreach (ExtraField field in Model.EditRecord.ExtraFields)

Views/Vehicle/_Notes.cshtml

@@ -6,6 +6,7 @@
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
+    var enableCsvImports = userConfig.EnableCsvImports;
 }
 <div class="row">
     <div class="d-flex justify-content-between">
@@ -23,7 +24,30 @@
             </datalist>
         </div>
         <div>
-            <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage,"Add Note")</button>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Note")</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="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="searchTableRows('notes-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Note")</button>
+            }
         </div>
     </div>
 </div>
@@ -31,14 +55,14 @@
     <div class="col-12">
         <div class="row mt-2 showOnPrint">
             <div class="d-flex">
-                <img src="/defaults/lubelogger_logo.png" />
+                <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             </div>
         </div>
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-3">@translator.Translate(userLanguage,"Description")</th>
-                    <th scope="col" class="col-9">@translator.Translate(userLanguage,"Note")</th>
+                    <th scope="col" class="col-4 col-md-3 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" class="col-8 col-md-9 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Note")</th>
                 </tr>
             </thead>
             <tbody>
@@ -47,15 +71,22 @@
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@note.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditNoteModal,@note.Id)" data-tags='@string.Join(" ", note.Tags)'>
                         @if (note.Pinned)
                         {
-                            <td class="col-3"><i class='bi bi-pin-fill me-2'></i>@note.Description</td>
+                            <td class="col-4 col-md-3 flex-grow-1 flex-shrink-1 text-truncate"><i class='bi bi-pin-fill me-2'></i>@note.Description</td>
                         } else
                         {
-                            <td class="col-3">@note.Description</td>
+                            <td class="col-4 col-md-3 flex-grow-1 flex-shrink-1 text-truncate">@note.Description</td>
                         }
-                        <td class="col-9 text-truncate" data-record-type="cost">@CarCareTracker.Helper.StaticHelper.TruncateStrings(note.NoteText, 100)</td>
+                        <td class="col-8 col-md-9 flex-grow-1 flex-shrink-1 text-truncate" data-record-type="cost">@StaticHelper.TruncateStrings(note.NoteText, 100)</td>
                     </tr>
                 }
             </tbody>
+            <tfoot>
+                <tr class="d-flex">
+                    <td class="col-12 showOnPrint lubelogger-report-banner">
+                        @StaticHelper.ReportNote
+                    </td>
+                </tr>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -69,13 +100,14 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, true)">@translator.Translate(userLanguage, "Toggle Pin")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, true)">@translator.Translate(userLanguage, "Pin")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, false)">@translator.Translate(userLanguage, "Unpin")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, true)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Toggle Pin")</span><i class="bi bi-pin-angle-fill"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, true)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Pin")</span><i class="bi bi-pin-angle-fill"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="pinNotes(selectedRow, false, false)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Unpin")</span><i class="bi bi-pin-angle"></i></div></a></li>
     <li><hr class="dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'NoteRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'NoteRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
 </ul>

Views/Vehicle/_OdometerRecords.cshtml

@@ -46,6 +46,13 @@
                         <li><a class="dropdown-item" href="#" onclick="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="searchTableRows('odometer-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
                         <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
                         <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
                         <li class="dropdown-item">
                             <div class="list-group-item">
@@ -101,7 +108,7 @@
     <div class="col-12">
         <div class="row mt-2 showOnPrint">
             <div class="d-flex">
-                <img src="/defaults/lubelogger_logo.png" />
+                <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             </div>
         </div>
         <table class="table table-hover">
@@ -126,7 +133,7 @@
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="initialodometer">@odometerRecord.InitialMileage</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@odometerRecord.Mileage</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="distance" data-record-type="distance">@(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled)</td>
-                        <td class="col-2 col-xl-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75)</td>
+                        <td class="col-2 col-xl-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(odometerRecord.Notes, 75)</td>
                         @foreach (string extraFieldColumn in extraFields)
                         {
                             <td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
@@ -134,7 +141,7 @@
                                     var extraFieldValue = odometerRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
                                     if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
                                     {
-                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue)</a>
+                                        <a href="@extraFieldValue" onclick="noPropagation()" target="_blank">@StaticHelper.TruncateStrings(extraFieldValue)</a>
                                     }
                                     else
                                     {
@@ -146,6 +153,13 @@
                     </tr>
                 }
             </tbody>
+            <tfoot>
+                <tr class="d-flex">
+                    <td class="col-12 showOnPrint lubelogger-report-banner">
+                        @StaticHelper.ReportNote
+                    </td>
+                </tr>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -159,16 +173,17 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
-    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleOdometerRecords(selectedRow)">@translator.Translate(userLanguage, "Edit Multiple")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
+    <li><a class="context-menu-active-multiple dropdown-item" href="#" onclick="editMultipleOdometerRecords(selectedRow)"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Edit Multiple")</span><i class="bi bi-pencil-square"></i></div></a></li>
     <li><hr class="context-menu-multiple context-menu-deselect-all dropdown-divider"></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="recalculateDistance()">@translator.Translate(userLanguage, "Recalculate Distance")</a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="recalculateDistance()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Recalculate Distance")</span><i class="bi bi-plus-slash-minus"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
     <li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
-    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Adjust Odometer")</a></li>
+    <li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'OdometerRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
 </ul>
 @if (userColumnPreferences.Any())
 {

Views/Vehicle/_PlanOrderSupplies.cshtml

@@ -0,0 +1,46 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model List<SupplyAvailability>
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage, "Order Supplies")</h5>
+    <button type="button" class="btn-close" onclick="hideOrderSupplyModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    @if (!Model.Any() || Model.Any(x => x.Missing))
+    {
+        <p class="lead">@translator.Translate(userLanguage, "Missing Supplies, Please Delete This Template and Recreate It.")</p>
+    } else
+    {
+        <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-6 text-truncate">@translator.Translate(userLanguage, "Description")</th>
+                            <th scope="col" class="col-3 text-truncate">@translator.Translate(userLanguage, "Required")</th>
+                            <th scope="col" class="col-3 text-truncate">@translator.Translate(userLanguage, "In Stock")</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (SupplyAvailability supplyAvailability in Model)
+                        {
+                            <tr class="d-flex @(supplyAvailability.Insufficient ? "table-danger" : "")">
+                                <td class="col-6 text-truncate">@StaticHelper.TruncateStrings(supplyAvailability.Description)</td>
+                                <td class="col-3 text-truncate">@supplyAvailability.Required.ToString("N2")</td>
+                                <td class="col-3 text-truncate">@supplyAvailability.InStock.ToString("N2")</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    }
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideOrderSupplyModal()">@translator.Translate(userLanguage, "Cancel")</button>
+</div>

Views/Vehicle/_PlanRecordItem.cshtml

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

Views/Vehicle/_PlanRecordModal.cshtml

@@ -20,11 +20,8 @@
                     <label for="planRecordDescription">@translator.Translate(userLanguage, "Description")</label>
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
-                    <input type="text" inputmode="decimal" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "PlanRecord")
-                    }
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "PlanRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -108,7 +105,7 @@
         <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Plan Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_PlanRecordTemplateEditModal.cshtml

@@ -20,8 +20,8 @@
                     <label for="planRecordDescription">@translator.Translate(userLanguage, "Description")</label>
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
-                    <input type="text" inputmode="decimal" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @await Html.PartialAsync("_SupplyStore", "PlanRecordTemplate")
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "PlanRecordTemplate", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -85,7 +85,7 @@
     <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
     <button type="button" class="btn btn-primary" onclick="savePlanRecordTemplate(true)">@translator.Translate(userLanguage, "Edit Plan Record Template")</button>
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];

Views/Vehicle/_PlanRecordTemplateModal.cshtml

@@ -39,7 +39,7 @@
                                     }
                                     @if (planRecordTemplate.Supplies.Any())
                                     {
-                                        <i class="bi bi-shop ms-2"></i>
+                                        <i class="bi bi-shop ms-2" style="cursor:pointer;"onclick="orderPlanSupplies(@planRecordTemplate.Id)"></i>
                                     }
                                     @if (planRecordTemplate.ImportMode == ImportMode.ServiceRecord)
                                     {

Views/Vehicle/_PlanRecords.cshtml

@@ -44,7 +44,7 @@
     <div class="col-12">
         <div class="row mt-2 showOnPrint">
             <div class="d-flex">
-                <img src="/defaults/lubelogger_logo.png" />
+                <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             </div>
         </div>
         <div class="row swimlane">
@@ -109,4 +109,23 @@
         <div class="modal-content" id="planRecordTemplateModalContent">
         </div>
     </div>
-</div>
+</div>
+
+<div class="modal fade" data-bs-focus="false" id="planRecordTemplateSupplyOrderModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="planRecordTemplateSupplyOrderModalContent">
+        </div>
+    </div>
+</div>
+
+<ul class="table-context-menu dropdown-menu" style="display:none;">
+    <li><h6 class="dropdown-header context-menu-move move-header">@translator.Translate(userLanguage, "Move To")</h6></li>
+    <li><a class="dropdown-item context-menu-move move-planned" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Planned")</span><i class="bi bi-list-task"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-doing" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Doing")</span><i class="bi bi-tools"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-testing" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Testing")</span><i class="bi bi-eyeglasses"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-done" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Done")</span><i class="bi bi-check2-all"></i></div></a></li>
+    <li><hr class="context-menu-move move-header dropdown-divider"></li>
+    <li><a class="dropdown-item context-menu-move move-header context-menu-duplicate" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-header context-menu-duplicate-vehicle" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item context-menu-move move-header text-danger context-menu-delete" href="#"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
+</ul>

Views/Vehicle/_RecurringReminderSelector.cshtml

@@ -1,10 +1,10 @@
-@using CarCareTracker.Helper
-@inject IConfigHelper config
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
 }
+@using CarCareTracker.Helper
 @model List<ReminderRecord>
 @if (Model.Count() > 1)
 {
@@ -22,7 +22,7 @@
         }
     } else
     {
-        <!option value="0">No Recurring Reminders Found</!option>
+        <!option value="0">@translator.Translate(userLanguage, "No Recurring Reminders Found")</!option>
     }
 </select>
 <div id="recurringMultipleReminders" style="display:none;">

Views/Vehicle/_ReminderRecords.cshtml

@@ -7,6 +7,8 @@
     var userLanguage = userConfig.UserLanguage;
     var hasRefresh = Model.Where(x => (x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue) && x.IsRecurring).Any();
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
+    var enableCsvImports = userConfig.EnableCsvImports;
+    var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.ReminderRecord);
 }
 <div class="row">
     <div class="d-flex justify-content-between">
@@ -28,7 +30,68 @@
             </datalist>
         </div>
         <div>
-            <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
+                    <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="printTab()">@translator.Translate(userLanguage, "Print")</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="searchTableRows('reminder-tab-pane')">@translator.Translate(userLanguage, "Search")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <div class="list-group-item">
+                                <input class="btn-check" type="checkbox" id="chkSelectMode">
+                                <label class="dropdown-item" for="chkSelectMode">@translator.Translate(userLanguage, "Select Mode")</label>
+                            </div>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='urgency' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Urgency" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Urgency">@translator.Translate(userLanguage, "Urgency")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='metric' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Metric" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Metric">@translator.Translate(userLanguage, "Metric")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='date' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Date">
+                                <label class="form-check-label stretched-link" for="chkCol_Date">@translator.Translate(userLanguage, "Date")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='odometer' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Odometer">
+                                <label class="form-check-label stretched-link" for="chkCol_Odometer">@translator.Translate(userLanguage, "Odometer")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='description' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Description" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Description">@translator.Translate(userLanguage, "Description")</label>
+                            </div>
+                        </li>
+                        <li class="dropdown-item">
+                            <div class="list-group-item">
+                                <input class="form-check-input col-visible-toggle" data-column-toggle='notes' onChange="showTableColumns(this, 'ReminderRecord')" type="checkbox" id="chkCol_Notes" checked>
+                                <label class="form-check-label stretched-link" for="chkCol_Notes">@translator.Translate(userLanguage, "Notes")</label>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddReminderModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add Reminder")</button>
+            }
         </div>
     </div>
 </div>
@@ -36,45 +99,48 @@
     <div class="col-12">
         <div class="row mt-2 showOnPrint">
             <div class="d-flex">
-                <img src="/defaults/lubelogger_logo.png" />
+                <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             </div>
         </div>
         <table class="table table-hover">
             <thead class="sticky-top">
                 <tr class="d-flex">
-                    <th scope="col" class="col-1 text-truncate">@translator.Translate(userLanguage, "Urgency")</th>
-                    <th scope="col" class="col-2 text-truncate">@translator.Translate(userLanguage, "Metric")</th>
-                    <th scope="col" class="text-truncate @(hasRefresh ? "col-3 col-md-4" : "col-5")">@translator.Translate(userLanguage, "Description")</th>
-                    <th scope="col" class="col-2 col-md-3 text-truncate">@translator.Translate(userLanguage, "Notes")</th>
+                    <th scope="col" data-column="urgency" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Urgency")</th>
+                    <th scope="col" data-column="metric" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Metric")</th>
+                    <th scope="col" data-column="date" style="display:none;" class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Date")</th>
+                    <th scope="col" data-column="odometer" style="display:none;"  class="col-2 flex-grow-1 flex-shrink-1 text-truncate">@translator.Translate(userLanguage, "Odometer")</th>
+                    <th scope="col" data-column="description" class="flex-grow-1 flex-shrink-1 text-truncate @(hasRefresh ? "col-3" : "col-4")">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" data-column="notes" class="flex-grow-1 flex-shrink-1 col-2 text-truncate">@translator.Translate(userLanguage, "Notes")</th>
                     @if (hasRefresh)
                     {
-                        <th scope="col" class="col-2 col-md-1 text-truncate">@translator.Translate(userLanguage, "Done")</th>
+                        <th scope="col" class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">@translator.Translate(userLanguage, "Done")</th>
                     }
-                    <th scope="col" class="col-2 col-md-1 text-truncate">@translator.Translate(userLanguage, "Delete")</th>
+                    <th scope="col" class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">@translator.Translate(userLanguage, "Delete")</th>
                 </tr>
             </thead>
             <tbody>
                 @foreach (ReminderRecordViewModel reminderRecord in Model)
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@reminderRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditReminderRecordModal,@reminderRecord.Id)" data-tags='@string.Join(" ", reminderRecord.Tags)'>
-                        @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent)
-                        {
-                            <td class="col-1"><span class="text-danger d-inline-block d-md-none"><i class="bi bi-hourglass-split h3"></i></span><span class="badge text-bg-danger d-none d-md-inline-block">@translator.Translate(userLanguage, "Very Urgent")</span></td>
-                        }
-                        else if (reminderRecord.Urgency == ReminderUrgency.Urgent)
-                        {
-                            <td class="col-1"><span class="text-warning d-inline-block d-md-none"><i class="bi bi-hourglass-split h3"></i></span><span class="badge text-bg-warning d-none d-md-inline-block">@translator.Translate(userLanguage, "Urgent")</span></td>
-                        }
-                        else if (reminderRecord.Urgency == ReminderUrgency.PastDue)
-                        {
-                            <td class="col-1"><span class="text-secondary d-inline-block d-md-none"><i class="bi bi-hourglass-bottom h3"></i></span><span class="badge text-bg-secondary d-none d-md-inline-block">@translator.Translate(userLanguage, "Past Due")</span></td>
-                        }
-                        else
-                        {
-                            <td class="col-1"><span class="text-success d-inline-block d-md-none"><i class="bi bi-hourglass-top h3"></i></span><span class="badge text-bg-success d-none d-md-inline-block">@translator.Translate(userLanguage, "Not Urgent")</span></td>
-                        }
-                        <td class="col-2 text-truncate">
-                            <span data-column="metric" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true" data-bs-title="@($"<b><i class='bi bi-calendar-event me-2'></i></b>{reminderRecord.Date.ToShortDateString()}<b class='ms-2'><i class='bi bi-speedometer me-2'></i></b>{reminderRecord.Mileage}")">
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="urgency">
+                            @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent)
+                            {
+                                <span class="badge text-bg-danger">@translator.Translate(userLanguage, "Very Urgent")</span>
+                            }
+                            else if (reminderRecord.Urgency == ReminderUrgency.Urgent)
+                            {
+                                <span class="badge text-bg-warning">@translator.Translate(userLanguage, "Urgent")</span>
+                            }
+                            else if (reminderRecord.Urgency == ReminderUrgency.PastDue)
+                            {
+                                <span class="badge text-bg-secondary">@translator.Translate(userLanguage, "Past Due")</span>
+                            }
+                            else
+                            {
+                                <span class="badge text-bg-success">@translator.Translate(userLanguage, "Not Urgent")</span>
+                            }
+                        </td>
+                        <td class="col-2 text-truncate flex-grow-1 flex-shrink-1" data-column="metric">
                             @if (reminderRecord.Metric == ReminderMetric.Date)
                             {
                             @reminderRecord.Date.ToShortDateString()
@@ -87,25 +153,37 @@
                             {
                             @reminderRecord.Metric
                             }
-                            </span>
                         </td>
-                        <td class="text-truncate @(hasRefresh ? "col-3 col-md-4" : "col-5")" data-record-type='cost'>@reminderRecord.Description</td>
-                        <td class="col-2 col-md-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
+                        <td class="col-2 text-truncate flex-grow-1 flex-shrink-1" style="display:none;" data-column="date">
+                            @(reminderRecord.UserMetric == ReminderMetric.Both || reminderRecord.UserMetric == ReminderMetric.Date ? reminderRecord.Date.ToShortDateString() : "---")
+                        </td>
+                        <td class="col-2 text-truncate flex-grow-1 flex-shrink-1" style="display:none;" data-column="odometer">
+                            @(reminderRecord.UserMetric == ReminderMetric.Both || reminderRecord.UserMetric == ReminderMetric.Odometer ? reminderRecord.Mileage : "---")
+                        </td>
+                        <td data-column="description" class="flex-grow-1 flex-shrink-1 text-truncate @(hasRefresh ? "col-3" : "col-4")">@reminderRecord.Description</td>
+                        <td data-column="notes" class="flex-grow-1 flex-shrink-1 col-2 text-truncate">@StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
                         @if (hasRefresh)
                         {
-                            <td class="col-2 col-md-1 text-truncate">
+                            <td class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">
                                 @if((reminderRecord.Urgency == ReminderUrgency.VeryUrgent || reminderRecord.Urgency == ReminderUrgency.PastDue) && reminderRecord.IsRecurring)
                                 {
                                     <button type="button" class="btn btn-secondary" onclick="markDoneReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-check-lg"></i></button>
                                 }
                             </td>
                         }
-                        <td class="col-2 col-md-1 text-truncate">
+                        <td class="flex-grow-1 flex-shrink-1 col-2 text-truncate hideOnPrint">
                             <button type="button" class="btn btn-danger" onclick="deleteReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-trash"></i></button>
                         </td>
                     </tr>
                 }
             </tbody>
+            <tfoot>
+                <tr class="d-flex">
+                    <td class="col-12 showOnPrint lubelogger-report-banner">
+                        @StaticHelper.ReportNote
+                    </td>
+                </tr>
+            </tfoot>
         </table>
     </div>
 </div>
@@ -117,15 +195,15 @@
 </div>
 
 <ul class="table-context-menu dropdown-menu" style="display:none;">
-    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
-    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Select All")</span><i class="bi bi-check-square"></i></div></a></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Deselect All")</span><i class="bi bi-x-square"></i></div></a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
-    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
-    <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ReminderRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'ReminderRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
+    <li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'ReminderRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
 </ul>
 
-<script>
-    if (!getDeviceIsTouchOnly()) {
-        $("[data-column='metric']").map((x, y) => new bootstrap.Tooltip(y));
-    }
-</script>
+@if (userColumnPreferences.Any())
+{
+    @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences)
+}

Views/Vehicle/_Report.cshtml

@@ -126,6 +126,12 @@
             <div class="d-grid">
                 <button onclick="exportAttachments()" class="btn btn-secondary btn-md mt-1 mb-1">@translator.Translate(userLanguage, "Export Attachments")<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
             </div>
+            @if (Model.CustomWidgetsConfigured)
+            {
+                <div class="d-grid">
+                    <button onclick="loadCustomWidgets()" class="btn btn-secondary btn-md mt-1 mb-1">@translator.Translate(userLanguage, "Additional Widgets")<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
+                </div>
+            }
         </div>
     </div>
 </div>
@@ -153,6 +159,15 @@
         </div>
     </div>
 </div>
+@if (Model.CustomWidgetsConfigured)
+{
+    <div class="modal fade" data-bs-focus="false" id="vehicleCustomWidgetsModal" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content" id="vehicleCustomWidgetsModalContent">
+            </div>
+        </div>
+    </div>
+}
 <div id="vehicleHistoryReport" class="showOnPrint"></div>
 
 <script>

Views/Vehicle/_ReportParameters.cshtml

@@ -0,0 +1,26 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@model ReportParameter
+<div id="columnSelector">
+    <ul class="list-group">
+        @foreach(string column in Model.VisibleColumns)
+        {
+            <li class="list-group-item text-start">
+                <input class="form-check-input column-default" type="checkbox" value="@column" id="visibleColumn_@column" checked>
+                <label class="form-check-label stretched-link" for="visibleColumn_@column">@(translator.Translate(userLanguage, column == nameof(GenericReportModel.DataType) ? "Type" : column))</label>
+            </li>
+        }
+        @foreach(string extraField in Model.ExtraFields)
+        {
+            <li class="list-group-item text-start">
+                <input class="form-check-input column-extrafield" type="checkbox" value="@extraField" id="extraField_@extraField">
+                <label class="form-check-label stretched-link" for="extraField_@extraField">@extraField</label>
+            </li>
+        }
+    </ul>
+</div>

Views/Vehicle/_ReportWidgets.cshtml

@@ -0,0 +1,2 @@
+@model string
+@Html.Raw(Model)

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -43,11 +43,8 @@
                         </div>
                     }
                     <label for="serviceRecordCost">@translator.Translate(userLanguage,"Cost")</label>
-                    <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")
-                    }
+                    <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="serviceRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the service")" value="@(isNew ? "" : Model.Cost)">
+                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "ServiceRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="serviceRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="serviceRecordTag">
                         @foreach(string tag in Model.Tags)
@@ -126,7 +123,7 @@
         <button type="button" class="btn btn-primary" onclick="saveServiceRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Service Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "serviceRecordCost" })
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];