diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs
index 7c30a9b..67c5427 100644
--- a/Helper/StaticHelper.cs
+++ b/Helper/StaticHelper.cs
@@ -12,7 +12,7 @@ namespace CarCareTracker.Helper
///
public static class StaticHelper
{
- public const string VersionNumber = "1.4.5";
+ public const string VersionNumber = "1.4.6";
public const string DbName = "data/cartracker.db";
public const string UserConfigPath = "data/config/userConfig.json";
public const string LegacyUserConfigPath = "config/userConfig.json";
diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js
index 6ad3c97..e4d7a33 100644
--- a/wwwroot/js/vehicle.js
+++ b/wwwroot/js/vehicle.js
@@ -619,36 +619,37 @@ function getAndValidateSelectedRecurringReminder() {
}
}
function getLastOdometerReadingAndIncrement(odometerFieldName) {
- Swal.fire({
- title: 'Increment Last Reported Odometer Reading',
- html: `
+ $.get(`/Vehicle/GetMaxMileage?vehicleId=${GetVehicleId().vehicleId}`, function (currentOdometer) {
+ let additionalHtml = isNaN(currentOdometer) || currentOdometer == 0 ? '' : `Current Odometer: ${currentOdometer}
`;
+ Swal.fire({
+ title: 'Increment Last Reported Odometer Reading',
+ html: `${additionalHtml}
`,
- confirmButtonText: 'Add',
- focusConfirm: false,
- preConfirm: () => {
- const odometerIncrement = parseInt(globalParseFloat($("#inputOdometerIncrement").val()));
- if (isNaN(odometerIncrement) || odometerIncrement <= 0) {
- Swal.showValidationMessage(`Please enter a non-zero amount to increment`);
- }
- return { odometerIncrement }
- },
- }).then(function (result) {
- if (result.isConfirmed) {
- var amountToIncrement = result.value.odometerIncrement;
- $.get(`/Vehicle/GetMaxMileage?vehicleId=${GetVehicleId().vehicleId}`, function (data) {
- var newAmount = data + amountToIncrement;
- if (!isNaN(newAmount)) {
- var odometerField = $(`#${odometerFieldName}`);
- if (odometerField.length > 0) {
- odometerField.val(newAmount);
+ confirmButtonText: 'Add',
+ focusConfirm: false,
+ preConfirm: () => {
+ const odometerIncrement = parseInt(globalParseFloat($("#inputOdometerIncrement").val()));
+ if (isNaN(odometerIncrement) || odometerIncrement < 0) {
+ Swal.showValidationMessage(`Please enter a positive amount to increment or 0 to use current odometer`);
+ }
+ return { odometerIncrement }
+ },
+ }).then(function (result) {
+ if (result.isConfirmed) {
+ var amountToIncrement = result.value.odometerIncrement;
+ var newAmount = currentOdometer + amountToIncrement;
+ if (!isNaN(newAmount)) {
+ var odometerField = $(`#${odometerFieldName}`);
+ if (odometerField.length > 0) {
+ odometerField.val(newAmount);
+ } else {
+ errorToast(genericErrorMessage());
+ }
} else {
errorToast(genericErrorMessage());
}
- } else {
- errorToast(genericErrorMessage());
- }
- });
- }
+ }
+ });
});
}
\ No newline at end of file