diff --git a/Controllers/APIController.cs b/Controllers/APIController.cs index db480fb..2f8cebb 100644 --- a/Controllers/APIController.cs +++ b/Controllers/APIController.cs @@ -27,6 +27,7 @@ namespace CarCareTracker.Controllers private readonly IReminderHelper _reminderHelper; private readonly IGasHelper _gasHelper; private readonly IUserLogic _userLogic; + private readonly IOdometerLogic _odometerLogic; private readonly IFileHelper _fileHelper; private readonly IMailHelper _mailHelper; private readonly IConfigHelper _config; @@ -46,7 +47,8 @@ namespace CarCareTracker.Controllers IMailHelper mailHelper, IFileHelper fileHelper, IConfigHelper config, - IUserLogic userLogic) + IUserLogic userLogic, + IOdometerLogic odometerLogic) { _dataAccess = dataAccess; _noteDataAccess = noteDataAccess; @@ -63,6 +65,7 @@ namespace CarCareTracker.Controllers _gasHelper = gasHelper; _reminderHelper = reminderHelper; _userLogic = userLogic; + _odometerLogic = odometerLogic; _fileHelper = fileHelper; _config = config; } @@ -138,7 +141,7 @@ namespace CarCareTracker.Controllers Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes, Mileage = int.Parse(input.Odometer) }; - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord); + _odometerLogic.AutoInsertOdometerRecord(odometerRecord); } response.Success = true; response.Message = "Service Record Added"; @@ -205,7 +208,7 @@ namespace CarCareTracker.Controllers Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes, Mileage = int.Parse(input.Odometer) }; - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord); + _odometerLogic.AutoInsertOdometerRecord(odometerRecord); } response.Success = true; response.Message = "Repair Record Added"; @@ -272,7 +275,7 @@ namespace CarCareTracker.Controllers Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes, Mileage = int.Parse(input.Odometer) }; - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord); + _odometerLogic.AutoInsertOdometerRecord(odometerRecord); } response.Success = true; response.Message = "Upgrade Record Added"; @@ -353,7 +356,12 @@ namespace CarCareTracker.Controllers public IActionResult OdometerRecords(int vehicleId) { var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId); - var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Odometer = x.Mileage.ToString(), Notes = x.Notes }); + //determine if conversion is needed. + if (vehicleRecords.All(x => x.InitialMileage == default)) + { + vehicleRecords = _odometerLogic.AutoConvertOdometerRecord(vehicleRecords); + } + var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), InitialOdometer = x.InitialMileage.ToString(), Odometer = x.Mileage.ToString(), Notes = x.Notes }); return Json(result); } [TypeFilter(typeof(CollaboratorFilter))] @@ -384,6 +392,7 @@ namespace CarCareTracker.Controllers VehicleId = vehicleId, Date = DateTime.Parse(input.Date), Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes, + InitialMileage = (string.IsNullOrWhiteSpace(input.InitialOdometer) || int.Parse(input.InitialOdometer) == default) ? _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List()) : int.Parse(input.InitialOdometer), Mileage = int.Parse(input.Odometer) }; _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord); @@ -466,7 +475,7 @@ namespace CarCareTracker.Controllers Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes, Mileage = int.Parse(input.Odometer) }; - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord); + _odometerLogic.AutoInsertOdometerRecord(odometerRecord); } response.Success = true; response.Message = "Gas Record Added"; diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs index 46f1005..0d31f0b 100644 --- a/Controllers/VehicleController.cs +++ b/Controllers/VehicleController.cs @@ -36,6 +36,7 @@ namespace CarCareTracker.Controllers private readonly IReminderHelper _reminderHelper; private readonly IReportHelper _reportHelper; private readonly IUserLogic _userLogic; + private readonly IOdometerLogic _odometerLogic; private readonly IExtraFieldDataAccess _extraFieldDataAccess; public VehicleController(ILogger logger, @@ -57,6 +58,7 @@ namespace CarCareTracker.Controllers IOdometerRecordDataAccess odometerRecordDataAccess, IExtraFieldDataAccess extraFieldDataAccess, IUserLogic userLogic, + IOdometerLogic odometerLogic, IWebHostEnvironment webEnv, IConfigHelper config) { @@ -79,6 +81,7 @@ namespace CarCareTracker.Controllers _odometerRecordDataAccess = odometerRecordDataAccess; _extraFieldDataAccess = extraFieldDataAccess; _userLogic = userLogic; + _odometerLogic = odometerLogic; _webEnv = webEnv; _config = config; } @@ -265,7 +268,7 @@ namespace CarCareTracker.Controllers var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId); if (vehicleRecords.Any()) { - var exportData = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Notes = x.Notes, Odometer = x.Mileage.ToString(), Tags = string.Join(" ", x.Tags) }); + var exportData = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Notes = x.Notes, InitialOdometer = x.InitialMileage.ToString(), Odometer = x.Mileage.ToString(), Tags = string.Join(" ", x.Tags) }); using (var writer = new StreamWriter(fullExportFilePath)) { using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture)) @@ -460,7 +463,7 @@ namespace CarCareTracker.Controllers _gasRecordDataAccess.SaveGasRecordToVehicle(convertedRecord); if (_config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = convertedRecord.Date, VehicleId = convertedRecord.VehicleId, @@ -485,7 +488,7 @@ namespace CarCareTracker.Controllers _serviceRecordDataAccess.SaveServiceRecordToVehicle(convertedRecord); if (_config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = convertedRecord.Date, VehicleId = convertedRecord.VehicleId, @@ -500,6 +503,7 @@ namespace CarCareTracker.Controllers { VehicleId = vehicleId, Date = DateTime.Parse(importModel.Date), + InitialMileage = decimal.ToInt32(decimal.Parse(importModel.InitialOdometer, NumberStyles.Any)), Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)), Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes, Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList() @@ -540,7 +544,7 @@ namespace CarCareTracker.Controllers _collisionRecordDataAccess.SaveCollisionRecordToVehicle(convertedRecord); if (_config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = convertedRecord.Date, VehicleId = convertedRecord.VehicleId, @@ -564,7 +568,7 @@ namespace CarCareTracker.Controllers _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(convertedRecord); if (_config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = convertedRecord.Date, VehicleId = convertedRecord.VehicleId, @@ -646,7 +650,7 @@ namespace CarCareTracker.Controllers { if (gasRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = DateTime.Parse(gasRecord.Date), VehicleId = gasRecord.VehicleId, @@ -734,7 +738,7 @@ namespace CarCareTracker.Controllers { if (serviceRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = DateTime.Parse(serviceRecord.Date), VehicleId = serviceRecord.VehicleId, @@ -811,7 +815,7 @@ namespace CarCareTracker.Controllers { if (collisionRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = DateTime.Parse(collisionRecord.Date), VehicleId = collisionRecord.VehicleId, @@ -1004,7 +1008,7 @@ namespace CarCareTracker.Controllers { MonthName = x.Key.MonthName, Cost = x.Sum(y => y.Cost), - DistanceTraveled = x.Any(y => y.MinMileage != default) ? x.Max(y => y.MaxMileage) - x.Where(y => y.MinMileage != default).Min(y => y.MinMileage) : 0 + DistanceTraveled = 0 }).ToList(); //get reminders var reminders = GetRemindersAndUrgency(vehicleId, DateTime.Now); @@ -1376,7 +1380,7 @@ namespace CarCareTracker.Controllers { MonthName = x.Key.MonthName, Cost = x.Sum(y => y.Cost), - DistanceTraveled = x.Any(y => y.MinMileage != default) ? x.Max(y => y.MaxMileage) - x.Where(y => y.MinMileage != default).Min(y => y.MinMileage) : 0 + DistanceTraveled = 0 }).ToList(); return PartialView("_GasCostByMonthReport", groupedRecord); } @@ -1603,7 +1607,7 @@ namespace CarCareTracker.Controllers { if (upgradeRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = DateTime.Parse(upgradeRecord.Date), VehicleId = upgradeRecord.VehicleId, @@ -1968,7 +1972,7 @@ namespace CarCareTracker.Controllers { if (_config.GetUserConfig(User).EnableAutoOdometerInsert) { - _odometerRecordDataAccess.SaveOdometerRecordToVehicle(new OdometerRecord + _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord { Date = DateTime.Now, VehicleId = existingRecord.VehicleId, @@ -2071,6 +2075,11 @@ namespace CarCareTracker.Controllers public IActionResult GetOdometerRecordsByVehicleId(int vehicleId) { var result = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId); + //determine if conversion is needed. + if (result.All(x=>x.InitialMileage == default)) + { + result = _odometerLogic.AutoConvertOdometerRecord(result); + } bool _useDescending = _config.GetUserConfig(User).UseDescending; if (_useDescending) { @@ -2087,13 +2096,17 @@ namespace CarCareTracker.Controllers { //move files from temp. odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + if (odometerRecord.InitialMileage == default) + { + odometerRecord.InitialMileage = _odometerLogic.GetLastOdometerRecordMileage(odometerRecord.VehicleId, new List()); + } var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord.ToOdometerRecord()); return Json(result); } [HttpGet] - public IActionResult GetAddOdometerRecordPartialView() + public IActionResult GetAddOdometerRecordPartialView(int vehicleId) { - return PartialView("_OdometerRecordModal", new OdometerRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields }); + return PartialView("_OdometerRecordModal", new OdometerRecordInput() { InitialMileage = _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List()), ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields }); } [HttpGet] public IActionResult GetOdometerRecordForEditById(int odometerRecordId) @@ -2104,6 +2117,7 @@ namespace CarCareTracker.Controllers { Id = result.Id, Date = result.Date.ToShortDateString(), + InitialMileage = result.InitialMileage, Mileage = result.Mileage, Notes = result.Notes, VehicleId = result.VehicleId, diff --git a/Helper/ReportHelper.cs b/Helper/ReportHelper.cs index 1457942..f61c06d 100644 --- a/Helper/ReportHelper.cs +++ b/Helper/ReportHelper.cs @@ -24,9 +24,7 @@ namespace CarCareTracker.Helper { MonthId = x.Key, MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key), - Cost = 0, - MaxMileage = x.Max(y => y.Mileage), - MinMileage = x.Min(y => y.Mileage) + Cost = 0 }); } public IEnumerable GetServiceRecordSum(List serviceRecords, int year = 0) @@ -39,9 +37,7 @@ namespace CarCareTracker.Helper { MonthId = x.Key, MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key), - Cost = x.Sum(y => y.Cost), - MaxMileage = x.Max(y=>y.Mileage), - MinMileage = x.Min(y=>y.Mileage) + Cost = x.Sum(y => y.Cost) }); } public IEnumerable GetRepairRecordSum(List repairRecords, int year = 0) @@ -54,9 +50,7 @@ namespace CarCareTracker.Helper { MonthId = x.Key, MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key), - Cost = x.Sum(y => y.Cost), - MaxMileage = x.Max(y => y.Mileage), - MinMileage = x.Min(y => y.Mileage) + Cost = x.Sum(y => y.Cost) }); } public IEnumerable GetUpgradeRecordSum(List upgradeRecords, int year = 0) @@ -69,9 +63,7 @@ namespace CarCareTracker.Helper { MonthId = x.Key, MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key), - Cost = x.Sum(y => y.Cost), - MaxMileage = x.Max(y => y.Mileage), - MinMileage = x.Min(y => y.Mileage) + Cost = x.Sum(y => y.Cost) }); } public IEnumerable GetGasRecordSum(List gasRecords, int year = 0) @@ -84,9 +76,7 @@ namespace CarCareTracker.Helper { MonthId = x.Key, MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key), - Cost = x.Sum(y => y.Cost), - MaxMileage = x.Max(y => y.Mileage), - MinMileage = x.Min(y => y.Mileage) + Cost = x.Sum(y => y.Cost) }); } public IEnumerable GetTaxRecordSum(List taxRecords, int year = 0) diff --git a/Logic/OdometerLogic.cs b/Logic/OdometerLogic.cs new file mode 100644 index 0000000..d9db83a --- /dev/null +++ b/Logic/OdometerLogic.cs @@ -0,0 +1,67 @@ +using CarCareTracker.External.Interfaces; +using CarCareTracker.Models; + +namespace CarCareTracker.Logic +{ + public interface IOdometerLogic + { + int GetLastOdometerRecordMileage(int vehicleId, List odometerRecords); + bool AutoInsertOdometerRecord(OdometerRecord odometer); + List AutoConvertOdometerRecord(List odometerRecords); + } + public class OdometerLogic: IOdometerLogic + { + private readonly IOdometerRecordDataAccess _odometerRecordDataAccess; + private readonly ILogger _logger; + public OdometerLogic(IOdometerRecordDataAccess odometerRecordDataAccess, ILogger logger) + { + _odometerRecordDataAccess = odometerRecordDataAccess; + _logger = logger; + } + public int GetLastOdometerRecordMileage(int vehicleId, List odometerRecords) + { + if (!odometerRecords.Any()) + { + odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId); + } + if (!odometerRecords.Any()) + { + //no existing odometer records for this vehicle. + return 0; + } + return odometerRecords.Max(x => x.Mileage); + } + public bool AutoInsertOdometerRecord(OdometerRecord odometer) + { + var lastReportedMileage = GetLastOdometerRecordMileage(odometer.VehicleId, new List()); + odometer.InitialMileage = lastReportedMileage != default ? lastReportedMileage : odometer.Mileage; + + var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometer); + return result; + } + public List AutoConvertOdometerRecord(List odometerRecords) + { + //perform ordering + odometerRecords = odometerRecords.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList(); + int previousMileage = 0; + for (int i = 0; i < odometerRecords.Count; i++) + { + var currentObject = odometerRecords[i]; + if (previousMileage == default) + { + //first record + currentObject.InitialMileage = currentObject.Mileage; + } + else + { + //subsequent records + currentObject.InitialMileage = previousMileage; + } + //save to db. + _odometerRecordDataAccess.SaveOdometerRecordToVehicle(currentObject); + previousMileage = currentObject.Mileage; + } + return odometerRecords; + } + } +} diff --git a/MapProfile/ImportMappers.cs b/MapProfile/ImportMappers.cs index 2df1898..f44203b 100644 --- a/MapProfile/ImportMappers.cs +++ b/MapProfile/ImportMappers.cs @@ -10,6 +10,7 @@ namespace CarCareTracker.MapProfile Map(m => m.Date).Name(["date", "fuelup_date"]); Map(m => m.DateCreated).Name(["datecreated"]); Map(m => m.DateModified).Name(["datemodified"]); + Map(m => m.InitialOdometer).Name(["initialodometer"]); Map(m => m.Odometer).Name(["odometer"]); Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed"]); Map(m => m.Cost).Name(["cost", "total cost", "totalcost", "total price"]); diff --git a/Models/OdometerRecord/OdometerRecord.cs b/Models/OdometerRecord/OdometerRecord.cs index 45594c5..2f52988 100644 --- a/Models/OdometerRecord/OdometerRecord.cs +++ b/Models/OdometerRecord/OdometerRecord.cs @@ -5,7 +5,9 @@ public int Id { get; set; } public int VehicleId { get; set; } public DateTime Date { get; set; } + public int InitialMileage { get; set; } public int Mileage { get; set; } + public int DistanceTraveled { get { return Mileage - InitialMileage; } } public string Notes { get; set; } public List Tags { get; set; } = new List(); public List Files { get; set; } = new List(); diff --git a/Models/OdometerRecord/OdometerRecordInput.cs b/Models/OdometerRecord/OdometerRecordInput.cs index f2c445d..80a5089 100644 --- a/Models/OdometerRecord/OdometerRecordInput.cs +++ b/Models/OdometerRecord/OdometerRecordInput.cs @@ -5,11 +5,12 @@ public int Id { get; set; } public int VehicleId { get; set; } public string Date { get; set; } = DateTime.Now.ToShortDateString(); + public int InitialMileage { get; set; } public int Mileage { get; set; } public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); public List ExtraFields { get; set; } = new List(); - public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; } + public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields, InitialMileage = InitialMileage }; } } } diff --git a/Models/Report/CostForVehicleByMonth.cs b/Models/Report/CostForVehicleByMonth.cs index 83549b4..d4185e5 100644 --- a/Models/Report/CostForVehicleByMonth.cs +++ b/Models/Report/CostForVehicleByMonth.cs @@ -5,8 +5,6 @@ public int MonthId { get; set; } public string MonthName { get; set; } public decimal Cost { get; set; } - public int MaxMileage { get; set; } - public int MinMileage { get; set; } public int DistanceTraveled { get; set; } } } diff --git a/Models/Shared/ImportModel.cs b/Models/Shared/ImportModel.cs index b727eee..73c4e7b 100644 --- a/Models/Shared/ImportModel.cs +++ b/Models/Shared/ImportModel.cs @@ -11,6 +11,7 @@ public string Type { get; set; } public string Priority { get; set; } public string Progress { get; set; } + public string InitialOdometer { get; set; } public string Odometer { get; set; } public string Description { get; set; } public string Notes { get; set; } @@ -50,6 +51,7 @@ public class OdometerRecordExportModel { public string Date { get; set; } + public string InitialOdometer { get; set; } public string Odometer { get; set; } public string Notes { get; set; } public string Tags { get; set; } diff --git a/Program.cs b/Program.cs index a1d39ca..eab5fd5 100644 --- a/Program.cs +++ b/Program.cs @@ -69,6 +69,7 @@ builder.Services.AddSingleton(); //configure logic builder.Services.AddSingleton(); builder.Services.AddSingleton(); +builder.Services.AddSingleton(); if (!Directory.Exists("data")) { diff --git a/Views/API/Index.cshtml b/Views/API/Index.cshtml index 8542ab9..a1a092a 100644 --- a/Views/API/Index.cshtml +++ b/Views/API/Index.cshtml @@ -314,6 +314,7 @@
Body(form-data): {
date - Date to be entered
+ initialOdometer - Initial Odometer reading(optional)
odometer - Odometer reading
notes - notes(optional)
} diff --git a/Views/Vehicle/_OdometerRecordModal.cshtml b/Views/Vehicle/_OdometerRecordModal.cshtml index 74e701d..a26d522 100644 --- a/Views/Vehicle/_OdometerRecordModal.cshtml +++ b/Views/Vehicle/_OdometerRecordModal.cshtml @@ -22,6 +22,8 @@ + + diff --git a/Views/Vehicle/_OdometerRecords.cshtml b/Views/Vehicle/_OdometerRecords.cshtml index ca1cb0d..79921e3 100644 --- a/Views/Vehicle/_OdometerRecords.cshtml +++ b/Views/Vehicle/_OdometerRecords.cshtml @@ -52,12 +52,24 @@ +
  • +
    + + +
    +
    • +
  • +
    + + +
    +
  • @@ -95,8 +107,10 @@ @translator.Translate(userLanguage, "Date") + @translator.Translate(userLanguage, "Initial Odometer") @translator.Translate(userLanguage, "Odometer") - @translator.Translate(userLanguage, "Notes") + @translator.Translate(userLanguage, "Distance") + @translator.Translate(userLanguage, "Notes") @foreach (string extraFieldColumn in extraFields) { @extraFieldColumn @@ -108,8 +122,10 @@ { @odometerRecord.Date.ToShortDateString() + @odometerRecord.InitialMileage @odometerRecord.Mileage - @CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75) + @(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled) + @CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75) @foreach (string extraFieldColumn in extraFields) { @(odometerRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "") diff --git a/wwwroot/defaults/en_US.json b/wwwroot/defaults/en_US.json index b812018..97b5f26 100644 --- a/wwwroot/defaults/en_US.json +++ b/wwwroot/defaults/en_US.json @@ -1 +1 @@ -{"Garage":"Garage","Settings":"Settings","Admin_Panel":"Admin Panel","Logout":"Logout","Dark_Mode":"Dark Mode","Enable_CSV_Imports":"Enable CSV Imports","Use_Imperial_Calculation_for_Fuel_Economy_Calculations(MPG)":"Use Imperial Calculation for Fuel Economy Calculations(MPG)","This_Will_Also_Change_Units_to_Miles_and_Gallons":"This Will Also Change Units to Miles and Gallons","Use_UK_MPG_Calculation":"Use UK MPG Calculation","Input_Gas_Consumption_in_Liters,_it_will_be_converted_to_UK_Gals_for_MPG_Calculation":"Input Gas Consumption in Liters, it will be converted to UK Gals for MPG Calculation","Sort_lists_in_Descending_Order(Newest_to_Oldest)":"Sort lists in Descending Order(Newest to Oldest)","Replace_$0.00_Costs_with_---":"Replace $0.00 Costs with ---","Use_Three_Decimals_For_Fuel_Cost":"Use Three Decimals For Fuel Cost","Display_Saved_Notes_in_Markdown":"Display Saved Notes in Markdown","Auto_Refresh_Lapsed_Recurring_Reminders":"Auto Refresh Lapsed Recurring Reminders","Auto_Insert_Odometer_Records":"Auto Insert Odometer Records","Only_when_Adding_Service/Repair/Upgrade/Fuel_Record_or_Completing_a_Plan":"Only when Adding Service/Repair/Upgrade/Fuel Record or Completing a Plan","Enable_Authentication":"Enable Authentication","Visible_Tabs":"Visible Tabs","Service_Records":"Service Records","Dashboard":"Dashboard","Repairs":"Repairs","Upgrades":"Upgrades","Fuel":"Fuel","Odometer":"Odometer","Taxes":"Taxes","Notes":"Notes","Reminder":"Reminder","Supplies":"Supplies","Planner":"Planner","Default_Tab":"Default Tab","Service_Record":"Service Record","Tax":"Tax","Reminders":"Reminders","Backups":"Backups","Make":"Make","Restore":"Restore","About":"About","Add_New_Vehicle":"Add New Vehicle","Year":"Year","Year(must_be_after_1900)":"Year(must be after 1900)","Model":"Model","License_Plate":"License Plate","Electric_Vehicle":"Electric Vehicle","Use_Engine_Hours":"Use Engine Hours","Tags(optional)":"Tags(optional)","Upload_a_picture(optional)":"Upload a picture(optional)","Cancel":"Cancel","Edit_Vehicle":"Edit Vehicle","Delete_Vehicle":"Delete Vehicle","Manage_Vehicle":"Manage Vehicle","Expenses_by_Type":"Expenses by Type","Service":"Service","Expenses_by_Month":"Expenses by Month","As_of_Today":"As of Today","\u002B30_Days":"\u002B30 Days","\u002B60_Days":"\u002B60 Days","\u002B90_Days":"\u002B90 Days","Not_Urgent":"Not Urgent","Urgent":"Urgent","Very_Urgent":"Very Urgent","Past_Due":"Past Due","Reminders_by_Category":"Reminders by Category","Reminders_by_Urgency":"Reminders by Urgency","Collaborators":"Collaborators","Username":"Username","Delete":"Delete","Fuel_Mileage_by_Month":"Fuel Mileage by Month","Vehicle_Maintenance_Report":"Vehicle Maintenance Report","Export_Attachments":"Export Attachments","Gasoline":"Gasoline","Last_Reported_Odometer_Reading":"Last Reported Odometer Reading","Average_Fuel_Economy":"Average Fuel Economy","Total_Spent(excl._fuel)":"Total Spent(excl. fuel)","Total_Spent_on_Fuel":"Total Spent on Fuel","Type":"Type","Date":"Date","Description":"Description","Cost":"Cost","Repair":"Repair","Upgrade":"Upgrade","#_of_Odometer_Records":"# of Odometer Records","Add_Odometer_Record":"Add Odometer Record","Import_via_CSV":"Import via CSV","Export_to_CSV":"Export to CSV","Print":"Print","Add_New_Odometer_Record":"Add New Odometer Record","Date_recorded":"Date recorded","Odometer_reading":"Odometer reading","Notes(optional)":"Notes(optional)","Upload_documents(optional)":"Upload documents(optional)","Max_File_Size:_28.6MB":"Max File Size: 28.6MB","#_of_Service_Records":"# of Service Records","Total":"Total","Add_Service_Record":"Add Service Record","No_data_found,_create_reminders_to_see_visualizations_here.":"No data found, create reminders to see visualizations here.","No_data_found,_insert/select_some_data_to_see_visualizations_here.":"No data found, insert/select some data to see visualizations here.","Edit_Odometer_Record":"Edit Odometer Record","Import_Data_from_CSV":"Import Data from CSV","In_order_for_this_utility_to_function_properly,_your_CSV_file_MUST_be_formatted_exactly_like_the_provided_sample._Dates_must_be_supplied_in_a_string._Numbers_must_be_supplied_as_numbers_without_currency_formatting.":"In order for this utility to function properly, your CSV file MUST be formatted exactly like the provided sample. Dates must be supplied in a string. Numbers must be supplied as numbers without currency formatting.","Failure_to_format_the_data_correctly_can_cause_data_corruption._Please_make_sure_you_make_a_copy_of_the_local_database_before_proceeding.":"Failure to format the data correctly can cause data corruption. Please make sure you make a copy of the local database before proceeding.","Download_Sample":"Download Sample","Upload_CSV_File":"Upload CSV File","Import":"Import","Edit_Service_Record":"Edit Service Record","Date_service_was_performed":"Date service was performed","Odometer_reading_when_serviced":"Odometer reading when serviced","Description_of_item(s)_serviced(i.e._Oil_Change)":"Description of item(s) serviced(i.e. Oil Change)","Cost_of_the_service":"Cost of the service","Move_To":"Move To","#_of_Repair_Records":"# of Repair Records","Add_Repair_Record":"Add Repair Record","Add_New_Repair_Record":"Add New Repair Record","Date_repair_was_performed":"Date repair was performed","Odometer_reading_when_repaired":"Odometer reading when repaired","Description_of_item(s)_repaired(i.e._Alternator)":"Description of item(s) repaired(i.e. Alternator)","Cost_of_the_repair":"Cost of the repair","Choose_Supplies":"Choose Supplies","Add_Reminder":"Add Reminder","Select_Supplies":"Select Supplies","No_supplies_with_quantities_greater_than_0_is_found.":"No supplies with quantities greater than 0 is found.","Select":"Select","#_of_Upgrade_Records":"# of Upgrade Records","Add_Upgrade_Record":"Add Upgrade Record","Add_New_Upgrade_Record":"Add New Upgrade Record","Date_upgrade/mods_was_installed":"Date upgrade/mods was installed","Odometer_reading_when_upgraded/modded":"Odometer reading when upgraded/modded","Description_of_item(s)_upgraded/modded":"Description of item(s) upgraded/modded","Cost_of_the_upgrade/mods":"Cost of the upgrade/mods","#_of_Gas_Records":"# of Gas Records","Total_Fuel_Consumed":"Total Fuel Consumed","Total_Cost":"Total Cost","Add_Gas_Record":"Add Gas Record","Date_Refueled":"Date Refueled","Consumption":"Consumption","Fuel_Economy":"Fuel Economy","Unit_Cost":"Unit Cost","#_of_Supply_Records":"# of Supply Records","Add_Supply_Record":"Add Supply Record","Part_#":"Part #","Supplier":"Supplier","Quantity":"Quantity","Add_New_Supply_Record":"Add New Supply Record","Date_purchased":"Date purchased","Part_Number":"Part Number","Part_#/Model_#/SKU_#":"Part #/Model #/SKU #","Description_of_the_Part/Supplies":"Description of the Part/Supplies","Supplier/Vendor":"Supplier/Vendor","Part_Supplier":"Part Supplier","Edit_Supply_Record":"Edit Supply Record","Add_New_Service_Record":"Add New Service Record","Supplies_are_requisitioned_immediately_after_the_record_is_created_and_cannot_be_modified._If_you_have_incorrectly_entered_the_amount_you_needed_you_will_need_to_correct_it_in_the_Supplies_tab.":"Supplies are requisitioned immediately after the record is created and cannot be modified. If you have incorrectly entered the amount you needed you will need to correct it in the Supplies tab.","In_Stock":"In Stock","Edit_Repair_Record":"Edit Repair Record","Edit_Upgrade_Record":"Edit Upgrade Record","Save_Vehicle":"Save Vehicle","Add_New_Gas_Record":"Add New Gas Record","Date_refueled":"Date refueled","Odometer_Reading":"Odometer Reading","Odometer_reading_when_refueled":"Odometer reading when refueled","Fuel_Consumption":"Fuel Consumption","Amount_of_gas_refueled":"Amount of gas refueled","Is_Filled_To_Full":"Is Filled To Full","Missed_Fuel_Up(Skip_MPG_Calculation)":"Missed Fuel Up(Skip MPG Calculation)","Cost_of_gas_refueled":"Cost of gas refueled","Unit":"Unit","#_of_Tax_Records":"# of Tax Records","Add_Tax_Record":"Add Tax Record","Add_New_Tax_Record":"Add New Tax Record","Date_tax_was_paid":"Date tax was paid","Description_of_tax_paid(i.e._Registration)":"Description of tax paid(i.e. Registration)","Cost_of_tax_paid":"Cost of tax paid","Is_Recurring":"Is Recurring","Month":"Month","1_Month":"1 Month","3_Months":"3 Months","6_Months":"6 Months","1_Year":"1 Year","2_Years":"2 Years","3_Years":"3 Years","5_Years":"5 Years","Edit_Tax_Record":"Edit Tax Record","#_of_Notes":"# of Notes","Add_Note":"Add Note","Note":"Note","Add_New_Note":"Add New Note","Pinned":"Pinned","Description_of_the_note":"Description of the note","Min_Fuel_Economy":"Min Fuel Economy","Max_Fuel_Economy":"Max Fuel Economy","Edit_Gas_Record":"Edit Gas Record","#_of_Plan_Records":"# of Plan Records","Add_Plan_Record":"Add Plan Record","Planned":"Planned","Doing":"Doing","Testing":"Testing","Done":"Done","Add_New_Plan_Record":"Add New Plan Record","Describe_the_Plan":"Describe the Plan","Cost_of_the_Plan":"Cost of the Plan","Priority":"Priority","Critical":"Critical","Normal":"Normal","Low":"Low","Current_Stage":"Current Stage","#_of_Reminders":"# of Reminders","Urgency":"Urgency","Metric":"Metric","Add_New_Reminder":"Add New Reminder","Reminder_Description":"Reminder Description","Remind_me_on":"Remind me on","Future_Date":"Future Date","Future_Odometer_Reading":"Future Odometer Reading","Whichever_comes_first":"Whichever comes first","Other":"Other","Edit_Reminder":"Edit Reminder","Replace_picture(optional)":"Replace picture(optional)","Language":"Language","Manage_Languages":"Manage Languages","Upload":"Upload","Tokens":"Tokens","Generate_User_Token":"Generate User Token","Auto_Notify(via_Email)":"Auto Notify(via Email)","Token":"Token","Issued_To":"Issued To","Users":"Users","Email":"Email","Is_Admin":"Is Admin","An_error_has_occurred,_please_try_again_later":"An error has occurred, please try again later","Edit_Note":"Edit Note","Password":"Password","Remember_Me":"Remember Me","Login":"Login","Forgot_Password":"Forgot Password","Register":"Register","Request":"Request","I_Have_a_Token":"I Have a Token","Back_to_Login":"Back to Login","Email_Address":"Email Address","New_Password":"New Password","Reset_Password":"Reset Password","No_data_found_or_all_records_have_zero_sums,_insert_records_with_non-zero_sums_to_see_visualizations_here.":"No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.","Save_as_Template":"Save as Template","View_Templates":"View Templates","Select_Template":"Select Template","No_templates_are_found.":"No templates are found.","Use":"Use","Edit_Plan_Record":"Edit Plan Record","Date_Created":"Date Created","Last_Modified":"Last Modified","Shop_Supplies":"Shop Supplies","Uploaded_Documents":"Uploaded Documents","Upload_more_documents":"Upload more documents","Database_Migration":"Database Migration","Instructions":"Instructions","To_Postgres":"To Postgres","From_Postgres":"From Postgres","Import_To_Postgres":"Import To Postgres","Export_From_Postgres":"Export From Postgres","Create":"Create","Manage_Extra_Fields":"Manage Extra Fields","Add/Remove_Extra_Fields":"Add/Remove Extra Fields","Name":"Name","Required":"Required","Add_New_Field":"Add New Field","Close":"Close","Calendar":"Calendar","View_Reminder":"View Reminder","Mark_as_Done":"Mark as Done","Login_via":"Login via","Distance_Traveled_by_Month":"Distance Traveled by Month","Expenses_and_Distance_Traveled_by_Month":"Expenses and Distance Traveled by Month","Select_All":"Select All","Supply_Requisition_History":"Supply Requisition History","No_supply_requisitions_in_history":"No supply requisitions in history","Plan":"Plan","Deselect_All":"Deselect All","Duplicate":"Duplicate","Toggle_Pin":"Toggle Pin","Pin":"Pin","Unpin":"Unpin","Profile":"Profile","Update_Profile":"Update Profile","Account_Username":"Account Username","Send_Token":"Send Token","Update":"Update","Show_Extra_Field_Columns":"Show Extra Field Columns","Enabling_this_may_cause_performance_issues":"Enabling this may cause performance issues","Visible_Columns":"Visible Columns","Edit_Multiple":"Edit Multiple","Edit_Multiple_Records":"Edit Multiple Records","(multiple)":"(multiple)","Tags(use_---_to_clear_all_existing_tags)":"Tags(use --- to clear all existing tags)","Notes(use_---_to_clear_all_existing_notes)":"Notes(use --- to clear all existing notes)","Edit":"Edit","Search":"Search","Delta":"Delta","Vehicle":"Vehicle","Select_Reminder":"Select Reminder","Purchased_Date(optional)":"Purchased Date(optional)","Purchased_Date":"Purchased Date","Sold_Date(optional)":"Sold Date(optional)","Sold_Date":"Sold Date","SOLD":"SOLD","Days":"Days","Statistics":"Statistics","Hide_Sold_Vehicles":"Hide Sold Vehicles","Server-wide_Settings":"Server-wide Settings","Extra_Fields":"Extra Fields","Version":"Version","Configure_Reminder_Urgency_Thresholds":"Configure Reminder Urgency Thresholds","Urgent(Days)":"Urgent(Days)","Very_Urgent(Days)":"Very Urgent(Days)","Urgent(Distance)":"Urgent(Distance)","Very_Urgent(Distance)":"Very Urgent(Distance)","Save":"Save"} \ No newline at end of file +{"Garage":"Garage","Settings":"Settings","Admin_Panel":"Admin Panel","Logout":"Logout","Dark_Mode":"Dark Mode","Enable_CSV_Imports":"Enable CSV Imports","Use_Imperial_Calculation_for_Fuel_Economy_Calculations(MPG)":"Use Imperial Calculation for Fuel Economy Calculations(MPG)","This_Will_Also_Change_Units_to_Miles_and_Gallons":"This Will Also Change Units to Miles and Gallons","Use_UK_MPG_Calculation":"Use UK MPG Calculation","Input_Gas_Consumption_in_Liters,_it_will_be_converted_to_UK_Gals_for_MPG_Calculation":"Input Gas Consumption in Liters, it will be converted to UK Gals for MPG Calculation","Sort_lists_in_Descending_Order(Newest_to_Oldest)":"Sort lists in Descending Order(Newest to Oldest)","Replace_$0.00_Costs_with_---":"Replace $0.00 Costs with ---","Use_Three_Decimals_For_Fuel_Cost":"Use Three Decimals For Fuel Cost","Display_Saved_Notes_in_Markdown":"Display Saved Notes in Markdown","Auto_Refresh_Lapsed_Recurring_Reminders":"Auto Refresh Lapsed Recurring Reminders","Auto_Insert_Odometer_Records":"Auto Insert Odometer Records","Only_when_Adding_Service/Repair/Upgrade/Fuel_Record_or_Completing_a_Plan":"Only when Adding Service/Repair/Upgrade/Fuel Record or Completing a Plan","Enable_Authentication":"Enable Authentication","Visible_Tabs":"Visible Tabs","Service_Records":"Service Records","Dashboard":"Dashboard","Repairs":"Repairs","Upgrades":"Upgrades","Fuel":"Fuel","Odometer":"Odometer","Taxes":"Taxes","Notes":"Notes","Reminder":"Reminder","Supplies":"Supplies","Planner":"Planner","Default_Tab":"Default Tab","Service_Record":"Service Record","Tax":"Tax","Reminders":"Reminders","Backups":"Backups","Make":"Make","Restore":"Restore","About":"About","Add_New_Vehicle":"Add New Vehicle","Year":"Year","Year(must_be_after_1900)":"Year(must be after 1900)","Model":"Model","License_Plate":"License Plate","Electric_Vehicle":"Electric Vehicle","Use_Engine_Hours":"Use Engine Hours","Tags(optional)":"Tags(optional)","Upload_a_picture(optional)":"Upload a picture(optional)","Cancel":"Cancel","Edit_Vehicle":"Edit Vehicle","Delete_Vehicle":"Delete Vehicle","Manage_Vehicle":"Manage Vehicle","Expenses_by_Type":"Expenses by Type","Service":"Service","Expenses_by_Month":"Expenses by Month","As_of_Today":"As of Today","\u002B30_Days":"\u002B30 Days","\u002B60_Days":"\u002B60 Days","\u002B90_Days":"\u002B90 Days","Not_Urgent":"Not Urgent","Urgent":"Urgent","Very_Urgent":"Very Urgent","Past_Due":"Past Due","Reminders_by_Category":"Reminders by Category","Reminders_by_Urgency":"Reminders by Urgency","Collaborators":"Collaborators","Username":"Username","Delete":"Delete","Fuel_Mileage_by_Month":"Fuel Mileage by Month","Vehicle_Maintenance_Report":"Vehicle Maintenance Report","Export_Attachments":"Export Attachments","Gasoline":"Gasoline","Last_Reported_Odometer_Reading":"Last Reported Odometer Reading","Average_Fuel_Economy":"Average Fuel Economy","Total_Spent(excl._fuel)":"Total Spent(excl. fuel)","Total_Spent_on_Fuel":"Total Spent on Fuel","Type":"Type","Date":"Date","Description":"Description","Cost":"Cost","Repair":"Repair","Upgrade":"Upgrade","#_of_Odometer_Records":"# of Odometer Records","Add_Odometer_Record":"Add Odometer Record","Import_via_CSV":"Import via CSV","Export_to_CSV":"Export to CSV","Print":"Print","Add_New_Odometer_Record":"Add New Odometer Record","Date_recorded":"Date recorded","Odometer_reading":"Odometer reading","Notes(optional)":"Notes(optional)","Upload_documents(optional)":"Upload documents(optional)","Max_File_Size:_28.6MB":"Max File Size: 28.6MB","#_of_Service_Records":"# of Service Records","Total":"Total","Add_Service_Record":"Add Service Record","No_data_found,_create_reminders_to_see_visualizations_here.":"No data found, create reminders to see visualizations here.","No_data_found,_insert/select_some_data_to_see_visualizations_here.":"No data found, insert/select some data to see visualizations here.","Edit_Odometer_Record":"Edit Odometer Record","Import_Data_from_CSV":"Import Data from CSV","In_order_for_this_utility_to_function_properly,_your_CSV_file_MUST_be_formatted_exactly_like_the_provided_sample._Dates_must_be_supplied_in_a_string._Numbers_must_be_supplied_as_numbers_without_currency_formatting.":"In order for this utility to function properly, your CSV file MUST be formatted exactly like the provided sample. Dates must be supplied in a string. Numbers must be supplied as numbers without currency formatting.","Failure_to_format_the_data_correctly_can_cause_data_corruption._Please_make_sure_you_make_a_copy_of_the_local_database_before_proceeding.":"Failure to format the data correctly can cause data corruption. Please make sure you make a copy of the local database before proceeding.","Download_Sample":"Download Sample","Upload_CSV_File":"Upload CSV File","Import":"Import","Edit_Service_Record":"Edit Service Record","Date_service_was_performed":"Date service was performed","Odometer_reading_when_serviced":"Odometer reading when serviced","Description_of_item(s)_serviced(i.e._Oil_Change)":"Description of item(s) serviced(i.e. Oil Change)","Cost_of_the_service":"Cost of the service","Move_To":"Move To","#_of_Repair_Records":"# of Repair Records","Add_Repair_Record":"Add Repair Record","Add_New_Repair_Record":"Add New Repair Record","Date_repair_was_performed":"Date repair was performed","Odometer_reading_when_repaired":"Odometer reading when repaired","Description_of_item(s)_repaired(i.e._Alternator)":"Description of item(s) repaired(i.e. Alternator)","Cost_of_the_repair":"Cost of the repair","Choose_Supplies":"Choose Supplies","Add_Reminder":"Add Reminder","Select_Supplies":"Select Supplies","No_supplies_with_quantities_greater_than_0_is_found.":"No supplies with quantities greater than 0 is found.","Select":"Select","#_of_Upgrade_Records":"# of Upgrade Records","Add_Upgrade_Record":"Add Upgrade Record","Add_New_Upgrade_Record":"Add New Upgrade Record","Date_upgrade/mods_was_installed":"Date upgrade/mods was installed","Odometer_reading_when_upgraded/modded":"Odometer reading when upgraded/modded","Description_of_item(s)_upgraded/modded":"Description of item(s) upgraded/modded","Cost_of_the_upgrade/mods":"Cost of the upgrade/mods","#_of_Gas_Records":"# of Gas Records","Total_Fuel_Consumed":"Total Fuel Consumed","Total_Cost":"Total Cost","Add_Gas_Record":"Add Gas Record","Date_Refueled":"Date Refueled","Consumption":"Consumption","Fuel_Economy":"Fuel Economy","Unit_Cost":"Unit Cost","#_of_Supply_Records":"# of Supply Records","Add_Supply_Record":"Add Supply Record","Part_#":"Part #","Supplier":"Supplier","Quantity":"Quantity","Add_New_Supply_Record":"Add New Supply Record","Date_purchased":"Date purchased","Part_Number":"Part Number","Part_#/Model_#/SKU_#":"Part #/Model #/SKU #","Description_of_the_Part/Supplies":"Description of the Part/Supplies","Supplier/Vendor":"Supplier/Vendor","Part_Supplier":"Part Supplier","Edit_Supply_Record":"Edit Supply Record","Add_New_Service_Record":"Add New Service Record","Supplies_are_requisitioned_immediately_after_the_record_is_created_and_cannot_be_modified._If_you_have_incorrectly_entered_the_amount_you_needed_you_will_need_to_correct_it_in_the_Supplies_tab.":"Supplies are requisitioned immediately after the record is created and cannot be modified. If you have incorrectly entered the amount you needed you will need to correct it in the Supplies tab.","In_Stock":"In Stock","Edit_Repair_Record":"Edit Repair Record","Edit_Upgrade_Record":"Edit Upgrade Record","Save_Vehicle":"Save Vehicle","Add_New_Gas_Record":"Add New Gas Record","Date_refueled":"Date refueled","Odometer_Reading":"Odometer Reading","Odometer_reading_when_refueled":"Odometer reading when refueled","Fuel_Consumption":"Fuel Consumption","Amount_of_gas_refueled":"Amount of gas refueled","Is_Filled_To_Full":"Is Filled To Full","Missed_Fuel_Up(Skip_MPG_Calculation)":"Missed Fuel Up(Skip MPG Calculation)","Cost_of_gas_refueled":"Cost of gas refueled","Unit":"Unit","#_of_Tax_Records":"# of Tax Records","Add_Tax_Record":"Add Tax Record","Add_New_Tax_Record":"Add New Tax Record","Date_tax_was_paid":"Date tax was paid","Description_of_tax_paid(i.e._Registration)":"Description of tax paid(i.e. Registration)","Cost_of_tax_paid":"Cost of tax paid","Is_Recurring":"Is Recurring","Month":"Month","1_Month":"1 Month","3_Months":"3 Months","6_Months":"6 Months","1_Year":"1 Year","2_Years":"2 Years","3_Years":"3 Years","5_Years":"5 Years","Edit_Tax_Record":"Edit Tax Record","#_of_Notes":"# of Notes","Add_Note":"Add Note","Note":"Note","Add_New_Note":"Add New Note","Pinned":"Pinned","Description_of_the_note":"Description of the note","Min_Fuel_Economy":"Min Fuel Economy","Max_Fuel_Economy":"Max Fuel Economy","Edit_Gas_Record":"Edit Gas Record","#_of_Plan_Records":"# of Plan Records","Add_Plan_Record":"Add Plan Record","Planned":"Planned","Doing":"Doing","Testing":"Testing","Done":"Done","Add_New_Plan_Record":"Add New Plan Record","Describe_the_Plan":"Describe the Plan","Cost_of_the_Plan":"Cost of the Plan","Priority":"Priority","Critical":"Critical","Normal":"Normal","Low":"Low","Current_Stage":"Current Stage","#_of_Reminders":"# of Reminders","Urgency":"Urgency","Metric":"Metric","Add_New_Reminder":"Add New Reminder","Reminder_Description":"Reminder Description","Remind_me_on":"Remind me on","Future_Date":"Future Date","Future_Odometer_Reading":"Future Odometer Reading","Whichever_comes_first":"Whichever comes first","Other":"Other","Edit_Reminder":"Edit Reminder","Replace_picture(optional)":"Replace picture(optional)","Language":"Language","Manage_Languages":"Manage Languages","Upload":"Upload","Tokens":"Tokens","Generate_User_Token":"Generate User Token","Auto_Notify(via_Email)":"Auto Notify(via Email)","Token":"Token","Issued_To":"Issued To","Users":"Users","Email":"Email","Is_Admin":"Is Admin","An_error_has_occurred,_please_try_again_later":"An error has occurred, please try again later","Edit_Note":"Edit Note","Password":"Password","Remember_Me":"Remember Me","Login":"Login","Forgot_Password":"Forgot Password","Register":"Register","Request":"Request","I_Have_a_Token":"I Have a Token","Back_to_Login":"Back to Login","Email_Address":"Email Address","New_Password":"New Password","Reset_Password":"Reset Password","No_data_found_or_all_records_have_zero_sums,_insert_records_with_non-zero_sums_to_see_visualizations_here.":"No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.","Save_as_Template":"Save as Template","View_Templates":"View Templates","Select_Template":"Select Template","No_templates_are_found.":"No templates are found.","Use":"Use","Edit_Plan_Record":"Edit Plan Record","Date_Created":"Date Created","Last_Modified":"Last Modified","Shop_Supplies":"Shop Supplies","Uploaded_Documents":"Uploaded Documents","Upload_more_documents":"Upload more documents","Database_Migration":"Database Migration","Instructions":"Instructions","To_Postgres":"To Postgres","From_Postgres":"From Postgres","Import_To_Postgres":"Import To Postgres","Export_From_Postgres":"Export From Postgres","Create":"Create","Manage_Extra_Fields":"Manage Extra Fields","Add/Remove_Extra_Fields":"Add/Remove Extra Fields","Name":"Name","Required":"Required","Add_New_Field":"Add New Field","Close":"Close","Calendar":"Calendar","View_Reminder":"View Reminder","Mark_as_Done":"Mark as Done","Login_via":"Login via","Distance_Traveled_by_Month":"Distance Traveled by Month","Expenses_and_Distance_Traveled_by_Month":"Expenses and Distance Traveled by Month","Select_All":"Select All","Supply_Requisition_History":"Supply Requisition History","No_supply_requisitions_in_history":"No supply requisitions in history","Plan":"Plan","Deselect_All":"Deselect All","Duplicate":"Duplicate","Toggle_Pin":"Toggle Pin","Pin":"Pin","Unpin":"Unpin","Profile":"Profile","Update_Profile":"Update Profile","Account_Username":"Account Username","Send_Token":"Send Token","Update":"Update","Show_Extra_Field_Columns":"Show Extra Field Columns","Enabling_this_may_cause_performance_issues":"Enabling this may cause performance issues","Visible_Columns":"Visible Columns","Edit_Multiple":"Edit Multiple","Edit_Multiple_Records":"Edit Multiple Records","(multiple)":"(multiple)","Tags(use_---_to_clear_all_existing_tags)":"Tags(use --- to clear all existing tags)","Notes(use_---_to_clear_all_existing_notes)":"Notes(use --- to clear all existing notes)","Edit":"Edit","Search":"Search","Delta":"Delta","Vehicle":"Vehicle","Select_Reminder":"Select Reminder","Purchased_Date(optional)":"Purchased Date(optional)","Purchased_Date":"Purchased Date","Sold_Date(optional)":"Sold Date(optional)","Sold_Date":"Sold Date","SOLD":"SOLD","Days":"Days","Statistics":"Statistics","Hide_Sold_Vehicles":"Hide Sold Vehicles","Server-wide_Settings":"Server-wide Settings","Extra_Fields":"Extra Fields","Version":"Version","Configure_Reminder_Urgency_Thresholds":"Configure Reminder Urgency Thresholds","Urgent(Days)":"Urgent(Days)","Very_Urgent(Days)":"Very Urgent(Days)","Urgent(Distance)":"Urgent(Distance)","Very_Urgent(Distance)":"Very Urgent(Distance)","Save":"Save","Initial_Odometer":"Initial Odometer","Distance":"Distance","Initial_Odometer_reading":"Initial Odometer reading"} \ No newline at end of file diff --git a/wwwroot/js/odometerrecord.js b/wwwroot/js/odometerrecord.js index 7f9668d..b61cde1 100644 --- a/wwwroot/js/odometerrecord.js +++ b/wwwroot/js/odometerrecord.js @@ -1,5 +1,5 @@ function showAddOdometerRecordModal() { - $.get('/Vehicle/GetAddOdometerRecordPartialView', function (data) { + $.get(`/Vehicle/GetAddOdometerRecordPartialView?vehicleId=${GetVehicleId().vehicleId}`, function (data) { if (data) { $("#odometerRecordModalContent").html(data); //initiate datepicker @@ -78,6 +78,7 @@ function saveOdometerRecordToVehicle(isEdit) { } function getAndValidateOdometerRecordValues() { var serviceDate = $("#odometerRecordDate").val(); + var initialOdometerMileage = parseInt(globalParseFloat($("#initialOdometerRecordMileage").val())).toString(); var serviceMileage = parseInt(globalParseFloat($("#odometerRecordMileage").val())).toString(); var serviceNotes = $("#odometerRecordNotes").val(); var serviceTags = $("#odometerRecordTag").val(); @@ -101,11 +102,18 @@ function getAndValidateOdometerRecordValues() { } else { $("#odometerRecordMileage").removeClass("is-invalid"); } + if (isNaN(initialOdometerMileage) || parseInt(initialOdometerMileage) < 0) { + hasError = true; + $("#initialOdometerRecordMileage").addClass("is-invalid"); + } else { + $("#initialOdometerRecordMileage").removeClass("is-invalid"); + } return { id: odometerRecordId, hasError: hasError, vehicleId: vehicleId, date: serviceDate, + initialMileage: initialOdometerMileage, mileage: serviceMileage, notes: serviceNotes, tags: serviceTags,