Merge branch 'dev' into oauth2

2022-07-27 16:29:57 +02:00
parent 5fcc3e9a44 9f362ef027
commit 2274b762a8
136 changed files with 1963 additions and 1212 deletions
--- a/fittrackee/workouts/workouts.py
+++ b/fittrackee/workouts/workouts.py
@@ -118,6 +118,15 @@ def get_workouts(auth_user: User) -> Union[Dict, HttpResponse]:
                    "workout_date": "Mon, 01 Jan 2018 00:00:00 GMT",
                    "workout_id": "kjxavSTUrJvoAh2wvCeGEF"
                  },
+                  {
+                    "id": 13,
+                    "record_type": "HA",
+                    "sport_id": 1,
+                    "user": "Sam",
+                    "value": 43.97,
+                    "workout_date": "Sun, 07 Jul 2019 08:00:00 GMT",
+                    "workout_id": "hvYBqYBRa7wwXpaStWR4V2"
+                  },
                  {
                    "id": 3,
                    "record_type": "LD",