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

Display fuel mileage unit and fix bug with metric fuel mileages

Browse Source
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD
2024-10-10 10:08:34 -06:00
parent 19e19d7c15
commit ed0775ab71
6 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Views/Vehicle/_GasCostByMonthReport.cshtml
View File

@@ -5,10 +5,10 @@
@{
var userConfig = config.GetUserConfig(User);
var userLanguage = userConfig.UserLanguage;
var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" };
var barGraphColors = StaticHelper.GetBarChartColors();
var sortedByMPG = Model.OrderBy(x => x.Cost).ToList();
}
@if (Model.Where(x=>x.Cost > 0).Any() || Model.Where(x=>x.DistanceTraveled > 0).Any())
@if (Model.Any(x=>x.Cost > 0) || Model.Any(x=>x.DistanceTraveled > 0))
{
<canvas id="bar-chart"></canvas>
<script>

13
Views/Vehicle/_MPGByMonthReport.cshtml
View File

@@ -1,14 +1,13 @@
@using CarCareTracker.Helper
@inject IConfigHelper config
@inject ITranslationHelper translator
@model List<CostForVehicleByMonth>
@model MPGForVehicleByMonth
@{
var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" };
var sortedByMPG = Model.OrderByDescending(x => x.Cost).ToList();
var barGraphColors = StaticHelper.GetBarChartColors();
var userConfig = config.GetUserConfig(User);
var userLanguage = userConfig.UserLanguage;
}
@if (Model.Where(x => x.Cost > 0).Any())
@if (Model.CostData.Any(x => x.Cost > 0))
{
<canvas id="bar-chart-mpg"></canvas>
@@ -20,11 +19,11 @@
//color gradient from high to low
var barGraphColors = [];
var useDarkMode = getGlobalConfig().useDarkMode;
@foreach (CostForVehicleByMonth gasCost in Model)
@foreach (CostForVehicleByMonth gasCost in Model.CostData)
{
@:barGraphLabels.push(decodeHTMLEntities("@gasCost.MonthName"));
@:barGraphData.push(globalParseFloat('@gasCost.Cost'));
var index = sortedByMPG.FindIndex(x => x.MonthName == gasCost.MonthName);
var index = Model.SortedCostData.FindIndex(x => x.MonthName == gasCost.MonthName);
@:barGraphColors.push('@barGraphColors[index]');
}
new Chart($("#bar-chart-mpg"), {
@@ -44,7 +43,7 @@
title: {
display: true,
color: useDarkMode ? "#fff" : "#000",
text: decodeHTMLEntities('@translator.Translate(userLanguage, "Fuel Mileage by Month")')
text: decodeHTMLEntities('@($"{translator.Translate(userLanguage, "Fuel Mileage by Month")}({Model.Unit})")')
},
legend: {
display: false,