From 3fd02681d178298551b0f8f3bba93964be30d4ca Mon Sep 17 00:00:00 2001 From: stilbruch Date: Sat, 7 May 2022 15:29:51 -0500 Subject: Basic progress graphs work --- app/routes/api.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/routes/api.py') diff --git a/app/routes/api.py b/app/routes/api.py index 77ebdcf..77c8650 100644 --- a/app/routes/api.py +++ b/app/routes/api.py @@ -34,7 +34,7 @@ def api_progress_exercise(exercise_id=None): return redirect(url_for("home")) results = ( - db.session.query(WorkoutRecord.id, db.func.max(SetRecord.lbs)) + db.session.query(WorkoutRecord.finished, db.func.max(SetRecord.lbs)) # .join(SetRecord.workout_record_id == WorkoutRecord.id) .filter( SetRecord.exercise_id == exercise_id, @@ -43,7 +43,10 @@ def api_progress_exercise(exercise_id=None): ).group_by(WorkoutRecord.id) ).all() - print(results) + # prepare values TODO include date + # jsonify can't handle objects so we have to do this hack + values = [(row[0].strftime("%m/%d/%y"), row[1]) for row in results] - # TODO doesnt work - return jsonify(results) + response = jsonify(values) + response.headers.add("Access-Control-Allow-Origin", "*") # for AJAX + return response -- cgit v1.2.3