WIP: Plot estimated 1rm on graphs as well, perhaps add another graph with graph options(reps, weight, 1rms etc)

templates/partials/page/person.html

@@ -189,6 +189,13 @@
                     name: 'Weight',
                     yaxis: 'y2',
                     type: 'scatter'
+                },
+                {
+                    x: {{ exercise_graph['StartDates'] | replace('"', "'") | safe }},
+                    y: {{ exercise_graph['Estimated1RM'] | replace('"', "'") | safe }},
+                    name: 'Estimated 1RM',
+                    yaxis: 'y3',
+                    type: 'scatter'
                 }
             ], 
             {
@@ -198,7 +205,16 @@
                 yaxis2: {
                     title: 'Weight',
                     overlaying: 'y',
-                    side: 'right', showgrid: false
+                    side: 'right',
+                    showgrid: false,
+                    position: 0.96
+                },
+                yaxis3: {
+                    title: 'Estimated 1RM',
+                    overlaying: 'y',
+                    side: 'right',
+                    showgrid: false,
+                    position: 1.00
                 }
             }, config);
         </script>

utils.py

@@ -15,7 +15,7 @@ def get_workouts(topsets):
         workouts.append({
             'WorkoutId': workout_id,
             'StartDate': topsets_in_workout[0]['StartDate'],
-            'TopSets': [{"TopSetId": t['TopSetId'], "ExerciseId": t['ExerciseId'], "ExerciseName": t['ExerciseName'], "Weight": t['Weight'], "Repetitions": t['Repetitions']} for t in topsets_in_workout if t['TopSetId'] is not None]
+            'TopSets': [{"TopSetId": t['TopSetId'], "ExerciseId": t['ExerciseId'], "ExerciseName": t['ExerciseName'], "Weight": t['Weight'], "Repetitions": t['Repetitions'], "Estimated1RM": t['Estimated1RM']} for t in topsets_in_workout if t['TopSetId'] is not None]
         })
 
     workouts.sort(key=lambda x: x['StartDate'], reverse=True)