Refactor stats into generic function

app.py

@@ -2,7 +2,7 @@ import os
 from flask import Flask, render_template, redirect, request, url_for
 from decorators import validate_person, validate_topset, validate_workout
 from db import DataBase
-from utils import get_people_and_exercise_rep_maxes, get_dashboard_stats
+from utils import get_people_and_exercise_rep_maxes
 
 app = Flask(__name__)
 app.config.from_pyfile('config.py')
@@ -15,8 +15,7 @@ def dashboard():
     all_topsets = db.get_all_topsets()
     people_and_exercise_rep_maxes = get_people_and_exercise_rep_maxes(
         all_topsets)
-    stats = get_dashboard_stats(all_topsets)
-    return render_template('index.html', model=people_and_exercise_rep_maxes, stats=stats)
+    return render_template('index.html', model=people_and_exercise_rep_maxes)
 
 
 @ app.route("/person/<int:person_id>")

db.py

@@ -4,7 +4,7 @@ from psycopg2.extras import RealDictCursor
 from datetime import datetime
 from urllib.parse import urlparse
 
-from utils import get_all_exercises_from_topsets, get_people_and_exercise_rep_maxes, get_workouts, get_person_stats
+from utils import get_all_exercises_from_topsets, get_stats_from_topsets, get_workouts
 
 
 class DataBase():
@@ -149,7 +149,7 @@ class DataBase():
         return {
             'PersonId': next((t['PersonId'] for t in topsets), -1),
             'PersonName': next((t['PersonName'] for t in topsets), 'Unknown'),
-            'Stats': get_person_stats(topsets),
+            'Stats': get_stats_from_topsets(topsets),
             'Exercises': get_all_exercises_from_topsets(topsets),
             'Workouts': get_workouts(topsets)
         }

templates/index.html

@@ -14,7 +14,7 @@
 </script>
 
 <div class="w-full grid grid-cols-1 xl:grid-cols-3 2xl:grid-cols-3 gap-4">
-    {% for p in model %}
+    {% for p in model['People'] %}
     <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
 
         <div class="mb-4 flex items-center justify-between">
@@ -91,55 +91,17 @@
 </div>
 
 <div class="mt-4 w-full grid grid-cols-1 md:grid-cols-3 2xl:grid-cols-4 xl:grid-cols-5 gap-4">
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{ stats['TotalWorkouts']
-                    }}</span>
-                <h3 class="text-base font-normal text-gray-500">Total workouts tracked</h3>
-            </div>
-        </div>
-    </div>
+    {% for stat in model['Stats'] %}
     <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
         <div class="flex items-center">
             <div class="flex-shrink-0">
                 <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{
-                    stats['AverageWorkoutsPerWeek']
-                    }}</span>
-                <h3 class="text-base font-normal text-gray-500">Avg. weekly workouts</h3>
+                    stat['Value'] }}</span>
+                <h3 class="text-base font-normal text-gray-500">{{ stat['Text'] }}</h3>
             </div>
         </div>
     </div>
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{ stats['NumberOfPeople']
-                    }}</span>
-                <h3 class="text-base font-normal text-gray-500">People tracked</h3>
-            </div>
-        </div>
-    </div>
-    {% if stats['TotalWorkouts'] > 0 %}
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{
-                    stats['DaysSinceFirstWorkout']
-                    }}</span>
-                <h3 class="text-base font-normal text-gray-500">Days since first workout</h3>
-            </div>
-        </div>
-    </div>
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{ stats['DaysSinceLastWorkout']
-                    }}</span>
-                <h3 class="text-base font-normal text-gray-500">Days since last workout</h3>
-            </div>
-        </div>
-    </div>
-    {% endif %}
+    {% endfor %}
 </div>
 
 {% endblock %}

templates/person.html

@@ -97,48 +97,17 @@
 </div>
 
 <div class="mt-4 w-full grid grid-cols-1 md:grid-cols-3 2xl:grid-cols-4 xl:grid-cols-5 gap-4">
+    {% for stat in person['Stats'] %}
     <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
         <div class="flex items-center">
             <div class="flex-shrink-0">
                 <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{
-                    person['Stats']['NumberOfWorkouts'] }}</span>
-                <h3 class="text-base font-normal text-gray-500">Total workouts tracked</h3>
+                    stat['Value'] }}</span>
+                <h3 class="text-base font-normal text-gray-500">{{ stat['Text'] }}</h3>
             </div>
         </div>
     </div>
-
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{
-                    person['Stats']['TrainingDurationInDays'] }}</span>
-                <h3 class="text-base font-normal text-gray-500">Duration of workout tracking</h3>
-            </div>
-        </div>
-    </div>
-
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{
-                    person['Stats']['AverageWorkoutsPerWeek'] }}</span>
-                <h3 class="text-base font-normal text-gray-500">Average weekly workouts</h3>
-            </div>
-        </div>
-    </div>
-
-    {% if person['Stats']['NumberOfWorkouts'] > 0 %}
-    <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-        <div class="flex items-center">
-            <div class="flex-shrink-0">
-                <span class="text-2xl sm:text-3xl leading-none font-bold text-gray-900">{{
-                    person['Stats']['DaysSinceLastWorkout'] }}</span>
-                <h3 class="text-base font-normal text-gray-500">Days since last workout</h3>
-            </div>
-        </div>
-    </div>
-    {% endif %}
-
+    {% endfor %}
 </div>
 
 {% endblock %}

templates/workout.html

@@ -29,7 +29,7 @@
                 </svg>
             </div>
             <input type="date"
-                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 w-full md:w-1/3"
+                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 w-full md:w-1/4"
                 name="start-date" value="{{ workout['StartDate'] }}">
         </div>
 

utils.py

@@ -85,36 +85,10 @@ def get_people_and_exercise_rep_maxes(topsets):
             'NumberOfWorkouts': len(list(set([t['WorkoutId'] for t in workouts_for_person if t['WorkoutId'] is not None]))),
             'Exercises': get_rep_maxes_for_person(workouts_for_person)
         })
-    return people
+    return {"People": people, "Stats": get_stats_from_topsets(topsets)}
 
 
-def get_person_stats(topsets):
-    workout_start_dates = [datetime.strptime(
-        workout['StartDate'], '%Y-%m-%d') for workout in topsets if workout['StartDate'] is not None]
-    if not workout_start_dates:
-        return {
-            'FirstWorkout': None,
-            'LastWorkout': None,
-            'NumberOfWorkouts': 0,
-            'TrainingDurationInDays': 0,
-            'AverageWorkoutsPerWeek': 0,
-            'DaysSinceLastWorkout': None,
-        }
-    first_workout_date = min(workout_start_dates)
-    last_workout_date = max(workout_start_dates)
-    training_duration = last_workout_date - first_workout_date
-    no_of_workouts = len(list(set([t['WorkoutId'] for t in topsets])))
-    return {
-        'FirstWorkout': first_workout_date.strftime("%b %d %Y"),
-        'LastWorkout': last_workout_date.strftime("%b %d %Y"),
-        'NumberOfWorkouts': no_of_workouts,
-        'TrainingDurationInDays': training_duration.days,
-        'AverageWorkoutsPerWeek': round(no_of_workouts / (training_duration.days / 7), 2),
-        'DaysSinceLastWorkout': (datetime.now() - last_workout_date).days,
-    }
-
-
-def get_dashboard_stats(topsets):
+def get_stats_from_topsets(topsets):
     workout_count = len(set([t['WorkoutId']
                              for t in topsets if t['WorkoutId'] is not None]))
     people_count = len(set([t['PersonId']
@@ -122,25 +96,21 @@ def get_dashboard_stats(topsets):
     workout_start_dates = [datetime.strptime(
         t['StartDate'], '%Y-%m-%d') for t in topsets if t['StartDate'] is not None]
 
-    if workout_count == 0:
-        return {
-            'TotalWorkouts': workout_count,
-            'NumberOfPeople': people_count,
-            'DaysSinceLastWorkout': None,
-            'AverageWorkoutsPerWeek': 0,
-        }
-
+    stats = [{"Text": "Total Workouts", "Value": workout_count}]
+    if people_count > 1:
+        stats.append({"Text": "Number of People", "Value": people_count})
+    if workout_count > 0:
         first_workout_date = min(workout_start_dates)
         last_workout_date = max(workout_start_dates)
         training_duration = last_workout_date - first_workout_date
         average_workouts_per_week = round(
             workout_count / (training_duration.days / 7), 2)
+        stats.append({"Text": "Days Since First Workout", "Value": (
+            datetime.now() - first_workout_date).days})
+        stats.append({"Text": "Days Since Last Workout",
+                     "Value": (
+                         datetime.now() - last_workout_date).days})
+        stats.append({"Text": "Average Workouts Per Week",
+                     "Value": average_workouts_per_week})
 
-    stats = {
-        'TotalWorkouts': workout_count,
-        'NumberOfPeople': people_count,
-        'DaysSinceFirstWorkout': (datetime.now() - first_workout_date).days,
-        'DaysSinceLastWorkout': training_duration.days,
-        'AverageWorkoutsPerWeek': average_workouts_per_week,
-    }
     return stats