cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs with alternate fuel units when the average min and max labels don't exist.

Browse Source
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD
2024-10-14 21:37:26 -06:00
parent 3d456d1cd5
commit f53ad74c72
1 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
wwwroot/js/gasrecord.js
View File

@@ -282,23 +282,29 @@ function convertFuelMileageUnits(currentUnit, destinationUnit, save) {
} }
}); });
//update labels up top. //update labels up top.
var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim()); if ($("#averageFuelMileageLabel").length > 0) {
if (newAverage > 0) { var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim());
newAverage = 100 / newAverage; if (newAverage > 0) {
var averageLabel = $("#averageFuelMileageLabel"); newAverage = 100 / newAverage;
averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`); var averageLabel = $("#averageFuelMileageLabel");
averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`);
}
} }
var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim()); if ($("#minFuelMileageLabel").length > 0) {
if (newMin > 0) { var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim());
newMin = 100 / newMin; if (newMin > 0) {
var minLabel = $("#minFuelMileageLabel"); newMin = 100 / newMin;
minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`); var minLabel = $("#minFuelMileageLabel");
minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`);
}
} }
var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim()); if ($("#maxFuelMileageLabel").length > 0) {
if (newMax > 0) { var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim());
newMax = 100 / newMax; if (newMax > 0) {
var maxLabel = $("#maxFuelMileageLabel"); newMax = 100 / newMax;
maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`); 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.text(sender.text().replace(sender.attr("data-unit"), "km/l"));
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)); elem.innerText = globalFloatToString(convertedAmount.toFixed(2));
} }
}); });
var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim()); if ($("#averageFuelMileageLabel").length > 0) {
if (newAverage > 0) { var newAverage = globalParseFloat($("#averageFuelMileageLabel").text().split(":")[1].trim());
newAverage = 100 / newAverage; if (newAverage > 0) {
var averageLabel = $("#averageFuelMileageLabel"); newAverage = 100 / newAverage;
averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`); var averageLabel = $("#averageFuelMileageLabel");
averageLabel.text(`${averageLabel.text().split(':')[0]}: ${globalFloatToString(newAverage.toFixed(2))}`);
}
} }
var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim()); if ($("#minFuelMileageLabel").length > 0) {
if (newMin > 0) { var newMin = globalParseFloat($("#minFuelMileageLabel").text().split(":")[1].trim());
newMin = 100 / newMin; if (newMin > 0) {
var minLabel = $("#minFuelMileageLabel"); newMin = 100 / newMin;
minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`); var minLabel = $("#minFuelMileageLabel");
minLabel.text(`${minLabel.text().split(':')[0]}: ${globalFloatToString(newMin.toFixed(2))}`);
}
} }
var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim()); if ($("#maxFuelMileageLabel").length > 0) {
if (newMax > 0) { var newMax = globalParseFloat($("#maxFuelMileageLabel").text().split(":")[1].trim());
newMax = 100 / newMax; if (newMax > 0) {
var maxLabel = $("#maxFuelMileageLabel"); newMax = 100 / newMax;
maxLabel.text(`${maxLabel.text().split(':')[0]}: ${globalFloatToString(newMax.toFixed(2))}`); 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.text(sender.text().replace(sender.attr("data-unit"), "l/100km"));
sender.attr("data-unit", "l/100km"); sender.attr("data-unit", "l/100km");