diff --git a/Views/Vehicle/_OdometerRecords.cshtml b/Views/Vehicle/_OdometerRecords.cshtml index 78ce679..4c2d985 100644 --- a/Views/Vehicle/_OdometerRecords.cshtml +++ b/Views/Vehicle/_OdometerRecords.cshtml @@ -131,7 +131,7 @@ @odometerRecord.Date.ToShortDateString() @odometerRecord.InitialMileage - @odometerRecord.Mileage + @odometerRecord.Mileage @(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled) @StaticHelper.TruncateStrings(odometerRecord.Notes, 75) @foreach (string extraFieldColumn in extraFields) diff --git a/Views/Vehicle/_ReminderRecords.cshtml b/Views/Vehicle/_ReminderRecords.cshtml index 07b3693..895bd25 100644 --- a/Views/Vehicle/_ReminderRecords.cshtml +++ b/Views/Vehicle/_ReminderRecords.cshtml @@ -140,7 +140,7 @@ @translator.Translate(userLanguage, "Not Urgent") } - + @if (reminderRecord.Metric == ReminderMetric.Date) { @reminderRecord.Date.ToShortDateString() diff --git a/wwwroot/js/odometerrecord.js b/wwwroot/js/odometerrecord.js index d7155e8..497b89d 100644 --- a/wwwroot/js/odometerrecord.js +++ b/wwwroot/js/odometerrecord.js @@ -139,7 +139,7 @@ function getAndValidateOdometerRecordValues() { function recalculateDistance() { //force distance recalculation - //reserved for when data is incoherent with negative distances due to non-chronologica order of odometer records. + //reserved for when data is incoherent with negative distances due to non-chronological order of odometer records. var vehicleId = GetVehicleId().vehicleId $.post(`/Vehicle/ForceRecalculateDistanceByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { @@ -362,15 +362,16 @@ function getRecordedOdometer() { return parseFloat(`${recordedOdometer}.${recordedSubOdometer}`); } function saveRecordedOdometer() { - //update current odometer value - $("#odometerRecordMileage").val(parseInt(getRecordedOdometer()).toString()); //save coordinates into a CSV file and upload - if (tripCoordinates.length > 0) { + if (tripCoordinates.length > 1) { + //update current odometer value + $("#odometerRecordMileage").val(parseInt(getRecordedOdometer()).toString()); + //generate attachment $.post('/Files/UploadCoordinates', { coordinates: tripCoordinates }, function (response) { uploadedFiles.push(response); $.post('/Vehicle/GetFilesPendingUpload', { uploadedFiles: uploadedFiles }, function (viewData) { $("#filesPendingUpload").html(viewData); - tripCoordinates = []; + tripCoordinates = ["Latitude,Longitude"]; }); }); } diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js index dbef2fd..d903903 100644 --- a/wwwroot/js/shared.js +++ b/wwwroot/js/shared.js @@ -1449,7 +1449,7 @@ function handleModalPaste(e, recordType) { } function handleEnter(e) { if ((event.ctrlKey || event.metaKey) && event.which == 13) { - var saveButton = $(e).parent().find(".modal-footer .btn-primary"); + var saveButton = $(e).parent().find(".modal-footer .btn-primary:not('.d-none')"); if (saveButton.length > 0) { saveButton.first().trigger('click'); }