From f53ad74c72757de54d1232bc68e78a65ef7a05b7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Mon, 14 Oct 2024 21:37:26 -0600 Subject: [PATCH] fix bugs with alternate fuel units when the average min and max labels don't exist. --- wwwroot/js/gasrecord.js | 72 ++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js index 1087b0d..fa99ecb 100644 --- a/wwwroot/js/gasrecord.js +++ b/wwwroot/js/gasrecord.js @@ -282,23 +282,29 @@ function convertFuelMileageUnits(currentUnit, destinationUnit, save) { } }); //update labels up top. - var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim()); - if (newAverage > 0) { - newAverage = 100 / newAverage; - var averageLabel = $("#averageFuelMileageLabel"); - averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`); + if ($("#averageFuelMileageLabel").length > 0) { + var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim()); + if (newAverage > 0) { + newAverage = 100 / newAverage; + var averageLabel = $("#averageFuelMileageLabel"); + averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`); + } } - var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim()); - if (newMin > 0) { - newMin = 100 / newMin; - var minLabel = $("#minFuelMileageLabel"); - minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`); + if ($("#minFuelMileageLabel").length > 0) { + var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim()); + if (newMin > 0) { + newMin = 100 / newMin; + var minLabel = $("#minFuelMileageLabel"); + minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`); + } } - var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim()); - if (newMax > 0) { - newMax = 100 / newMax; - var maxLabel = $("#maxFuelMileageLabel"); - maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`); + if ($("#maxFuelMileageLabel").length > 0) { + var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim()); + if (newMax > 0) { + newMax = 100 / newMax; + var maxLabel = $("#maxFuelMileageLabel"); + maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`); + } } sender.text(sender.text().replace(sender.attr("data-unit"), "km/l")); sender.attr("data-unit", "km/l"); @@ -315,23 +321,29 @@ function convertFuelMileageUnits(currentUnit, destinationUnit, save) { elem.innerText = globalFloatToString(convertedAmount.toFixed(2)); } }); - var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim()); - if (newAverage > 0) { - newAverage = 100 / newAverage; - var averageLabel = $("#averageFuelMileageLabel"); - averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`); + if ($("#averageFuelMileageLabel").length > 0) { + var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim()); + if (newAverage > 0) { + newAverage = 100 / newAverage; + var averageLabel = $("#averageFuelMileageLabel"); + averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`); + } } - var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim()); - if (newMin > 0) { - newMin = 100 / newMin; - var minLabel = $("#minFuelMileageLabel"); - minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`); + if ($("#minFuelMileageLabel").length > 0) { + var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim()); + if (newMin > 0) { + newMin = 100 / newMin; + var minLabel = $("#minFuelMileageLabel"); + minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`); + } } - var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim()); - if (newMax > 0) { - newMax = 100 / newMax; - var maxLabel = $("#maxFuelMileageLabel"); - maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`); + if ($("#maxFuelMileageLabel").length > 0) { + var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim()); + if (newMax > 0) { + newMax = 100 / newMax; + var maxLabel = $("#maxFuelMileageLabel"); + maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`); + } } sender.text(sender.text().replace(sender.attr("data-unit"), "l/100km")); sender.attr("data-unit", "l/100km");