diff --git a/db.py b/db.py index d07df51..de9be92 100644 --- a/db.py +++ b/db.py @@ -7,7 +7,7 @@ from urllib.parse import urlparse from flask import g -from utils import get_all_exercises_from_topsets, get_exercise_graph_model, get_stats_from_topsets, get_topsets_for_person, get_workouts +from utils import count_prs_over_time, get_all_exercises_from_topsets, get_exercise_graph_model, get_stats_from_topsets, get_topsets_for_person, get_weekly_pr_graph_model, get_workout_counts, get_workouts class DataBase(): @@ -186,6 +186,10 @@ class DataBase(): LEFT JOIN TopSet T ON W.workout_id=T.workout_id LEFT JOIN Exercise E ON T.exercise_id=E.exercise_id WHERE P.person_id=%s""", [person_id]) + + weekly_counts = get_workout_counts(topsets, 'week') + weekly_pr_counts = count_prs_over_time(topsets, 'week') + person_graphs = [get_weekly_pr_graph_model('Workouts per week', weekly_counts), get_weekly_pr_graph_model('PRs per week', weekly_pr_counts)] return { 'PersonId': next((t['PersonId'] for t in topsets), -1), @@ -193,7 +197,8 @@ class DataBase(): 'Stats': get_stats_from_topsets(topsets), 'Exercises': get_all_exercises_from_topsets(topsets), 'Workouts': get_workouts(topsets), - 'ExerciseProgressGraphs': get_topsets_for_person(topsets) + 'ExerciseProgressGraphs': get_topsets_for_person(topsets), + 'PersonGraphs': person_graphs } def get_workout(self, person_id, workout_id): diff --git a/templates/person.html b/templates/person.html index 3b00e1a..2d0d282 100644 --- a/templates/person.html +++ b/templates/person.html @@ -2,6 +2,14 @@ {% block content %} +