From d5f769e5a4362b6aa7f7124d18f5b6a01dd40410 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Fri, 24 Jan 2025 09:16:42 -0700 Subject: [PATCH] Fixed the cost per distance sum table to use total cost per year divided by total distance per year. --- Views/Vehicle/_CostDistanceTableReport.cshtml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Views/Vehicle/_CostDistanceTableReport.cshtml b/Views/Vehicle/_CostDistanceTableReport.cshtml index f151ae6..711a26c 100644 --- a/Views/Vehicle/_CostDistanceTableReport.cshtml +++ b/Views/Vehicle/_CostDistanceTableReport.cshtml @@ -49,10 +49,10 @@ @($"{StaticHelper.HideZeroCost(0M.ToString("C2"), hideZero, $"/{Model.DistanceUnit}")}") } } - } } - - } + } + + } @@ -65,9 +65,11 @@ var yearDataToDisplay = Model.CostData.Where(x => x.Year == year); if (yearDataToDisplay != null && yearDataToDisplay != default) { - @(StaticHelper.HideZeroCost(yearDataToDisplay.Sum(x => x.Cost).ToString("C2"), hideZero)) - @(yearDataToDisplay.Sum(x => x.DistanceTraveled) != default ? $"{yearDataToDisplay.Sum(x => x.DistanceTraveled).ToString("N0")} {Model.DistanceUnit}" : "---") - @(StaticHelper.HideZeroCost(yearDataToDisplay.Sum(x => x.CostPerDistanceTraveled).ToString("C2"), hideZero, $"/{Model.DistanceUnit}")) + var distanceTraveled = yearDataToDisplay.Sum(x => x.DistanceTraveled); + var costAccrued = yearDataToDisplay.Sum(x => x.Cost); + @(StaticHelper.HideZeroCost(costAccrued.ToString("C2"), hideZero)) + @(distanceTraveled != default ? $"{distanceTraveled.ToString("N0")} {Model.DistanceUnit}" : "---") + @(StaticHelper.HideZeroCost(distanceTraveled != default && costAccrued != default ? (costAccrued / distanceTraveled).ToString("C2") : 0M.ToString("C2"), hideZero, $"/{Model.DistanceUnit}")) } else {