sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-05 19:13:16 +02:00
parent 23f939c71d
commit 1052743344
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/tests/test_permissions.py
View File

@@ -982,9 +982,9 @@ class PermissionsViewTests(TestCase):
self.assertEqual(response.status_code,200)
self.assertRedirects(response,
expected_url = url,
status_code=302,target_status_code=200)
#self.assertRedirects(response,
# expected_url = url,
# status_code=302,target_status_code=200)
aantal2 = len(Workout.objects.filter(user=self.rbasic))

17
rowers/views/analysisviews.py
View File

@@ -4745,10 +4745,19 @@ def history_view(request,userid=0):
)
totalsdict['distance'] = totalmeters
totalsdict['powermean'] = df['power'].mean().astype(int)
totalsdict['powermax'] = df['power'].max().astype(int)
totalsdict['hrmean'] = df['hr'].mean().astype(int)
totalsdict['hrmax'] = df['hr'].max().astype(int)
try:
totalsdict['powermean'] = df['power'].mean().astype(int)
totalsdict['powermax'] = df['power'].max().astype(int)
except KeyError:
totalsdict['powermean'] = 0
totalsdict['powermax'] = 0
try:
totalsdict['hrmean'] = df['hr'].mean().astype(int)
totalsdict['hrmax'] = df['hr'].max().astype(int)
except KeyError:
totalsdict['hrmean'] = 0
totalsdict['hrmax'] = 0
totalsdict['nrworkouts'] = g_workouts.count()
breadcrumbs = [