From c5e825f4dfb93b9c07b0bb0925454190829159e2 Mon Sep 17 00:00:00 2001
From: Peter Stockings <pstockings@jadeworld.com>
Date: Sat, 9 Dec 2023 22:25:37 +1100
Subject: [PATCH] Make svg graph more generic, and make line of best fit the
 last line rendered so its always on top

---
 db.py                             | 2 +-
 templates/partials/sparkline.html | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/db.py b/db.py
index 566444c..acbbf8d 100644
--- a/db.py
+++ b/db.py
@@ -535,7 +535,7 @@ class DataBase():
 
         # Return exercise data with SVG dimensions and data points
         return {
-            'exercise_name': topsets[0]['exercise_name'],
+            'title': topsets[0]['exercise_name'],
             'vb_width': vb_width,
             'vb_height': vb_height,
             'plots': [repetitions, weight, estimated_1rm],
diff --git a/templates/partials/sparkline.html b/templates/partials/sparkline.html
index f4efdc3..eb3fe50 100644
--- a/templates/partials/sparkline.html
+++ b/templates/partials/sparkline.html
@@ -46,9 +46,8 @@
     <div id="popover-{{ unique_id }}" class="absolute t-0 r-0 hidden bg-white border border-gray-300 p-2 z-10">
     <!-- Popover content will be dynamically inserted here -->
     </div>
-    <h4 class="text-l font-semibold text-blue-400 mb-2 text-center">{{ exercise_name }}</h4>
+    <h4 class="text-l font-semibold text-blue-400 mb-2 text-center">{{ title }}</h4>
     <svg viewBox="0 0 {{ (vb_width + 2*margin) | int }} {{ (vb_height + 2*margin) | int }}" preserveAspectRatio="none">
-        <path d="{{ path_best_fit(best_fit_points, vb_height) }}" stroke="gray" stroke-dasharray="2,1" fill="none" stroke-opacity="40%"/>
         {% for plot in plots %}
         <g class="{{ plot.label }}" style="fill: {{ plot.color }}; stroke: {{ plot.color }};">
         {{ plot_line(plot.points, plot.color) }}
@@ -71,8 +70,7 @@
         {% endfor %}
         </g>
 
-        {% for pos in relative_positions %}
-        {% endfor %}
+        <path d="{{ path_best_fit(best_fit_points, vb_height) }}" stroke="gray" stroke-dasharray="2,1" fill="none" stroke-opacity="60%"/>
     </svg>
     <div class="flex justify-center pt-2">
         {% for plot in plots %}