Merge pull request #37 from hargata/Hargata/uk.mpg

Hargata/uk.mpg
This commit is contained in:
Hargata Softworks
2024-01-08 16:11:39 -07:00
committed by GitHub

View File

@@ -8,29 +8,27 @@
var useKwh = Model.UseKwh;
string consumptionUnit;
string fuelEconomyUnit;
string distanceUnit;
string distanceUnit = useMPG ? "mi." : "km";
if (useKwh)
{
consumptionUnit = "kWh";
fuelEconomyUnit = useMPG ? "mi/kWh" : "kWh/100km";
fuelEconomyUnit = useMPG ? "mi./kWh" : "kWh/100km";
}
else if (useMPG && useUKMPG)
{
consumptionUnit = "imp gal";
fuelEconomyUnit = "mpg";
} else if (useUKMPG)
{
fuelEconomyUnit = "l/100mi.";
consumptionUnit = "l";
distanceUnit = "mi.";
}
else
{
consumptionUnit = useMPG ? "US gal" : "l";
fuelEconomyUnit = useMPG ? "mpg" : "l/100km";
}
if (useUKMPG)
{
distanceUnit = "mi.";
} else {
distanceUnit = useMPG ? "mi" : "km";
}
}
<div class="row">
<div class="d-flex justify-content-between">
@@ -67,7 +65,7 @@
<thead>
<tr class="d-flex">
<th scope="col" class="col-2">Date Refueled</th>
<th scope="col" class="col-2">Odometer(@distanceUnit)</th>
<th scope="col" class="col-2">Odometer(@(distanceUnit))</th>
<th scope="col" class="col-2">Consumption(@(consumptionUnit))</th>
<th scope="col" class="col-4">Fuel Economy(@(fuelEconomyUnit))</th>
<th scope="col" class="col-1">Cost</th>