Another fix for statistics chart labels

Author: veloek

Tevling/Pages/Statistics.razor.cs

@@ -26,7 +26,7 @@ private Dictionary<string, float[]> GetAggregatedMeasurementData(Func<Activity,
         DateTimeOffset now = DateTimeOffset.Now;
 
         Dictionary<string, float[]> aggregatedData = _activities
-            .GroupBy(a => a.Details.Type)
+            .GroupBy(a => ActivityTypeExt.ToString(a.Details.Type))
             .ToDictionary(
                 g => g.Key.ToString(),
                 g => Enumerable.Range(-monthCount + 1, monthCount)
@@ -81,19 +81,22 @@ await _module.InvokeVoidAsync(
             distanceLastThreeMonths,
             lastThreeMonths,
             "totalDistanceChart",
-            "Total Distance [km]");
+            "Total Distance [km]",
+            "km");
         await _module.InvokeVoidAsync(
             "drawChart",
             elevationLastThreeMonths,
             lastThreeMonths,
             "totalElevationChart",
-            "Total Elevation [m]");
+            "Total Elevation [m]",
+            "m");
         await _module.InvokeVoidAsync(
             "drawChart",
             timeLastThreeMonths,
             lastThreeMonths,
             "totalTimeChart",
-            "Total Time [h]");
+            "Total Time [h]",
+            "h");
     }
 
     public async ValueTask DisposeAsync()

Tevling/Pages/Statistics.razor.js

@@ -1,4 +1,4 @@
-export function drawChart(activityData, labels, chartName, chartTitle) {
+export function drawChart(activityData, labels, chartName, chartTitle, unit) {
   var ctx = document.getElementById(chartName).getContext("2d");
 
   // Destroy existing chart instance if it exists
@@ -33,10 +33,25 @@ export function drawChart(activityData, labels, chartName, chartTitle) {
         },
         tooltip: {
           callbacks: {
-            label: (ctx) =>
-              Number.isInteger(ctx.parsed.y)
-                ? ctx.parsed.y
-                : ctx.parsed.y.toFixed(1),
+            label: (context) => {
+              let label = context.dataset.label || "";
+
+              if (label) {
+                label += ": ";
+              }
+
+              if (context.parsed.y !== null) {
+                label += Number.isInteger(context.parsed.y)
+                  ? context.parsed.y
+                  : context.parsed.y.toFixed(1);
+              }
+
+              if (unit) {
+                label += " " + unit;
+              }
+
+              return label;
+            },
           },
         },
       },