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

Merge tag 'v3.37' into develop

Browse Source 
bugfix
This commit is contained in:
Sander Roosendaal
2017-07-06 13:49:33 +02:00
parent 13ac0b17da af9eb1934f
commit 61f5fe6bc5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rowers/views.py
View File

@@ -3526,8 +3526,11 @@ def multiflex_view(request,userid=0,
except ValueError:
df['groupval'] = groups.mean()[groupby].fillna(value=0)
else:
df['groupval'] = [x.strftime("%Y-%m-%d") for x in groups.min()[groupby]]
try:
df['groupval'] = [x.strftime("%Y-%m-%d") for x in groups.min()[groupby]]
except AttributeError:
df['groupval'] = groups.mean()['days ago'].fillna(value=0)
if userid == 0:
extratitle = ''
else:
@@ -3654,7 +3657,11 @@ def multiflex_view(request,userid=0,
except ValueError:
df['groupval'] = groups.mean()[groupby].fillna(value=0)
else:
df['groupval'] = [x.strftime("%Y-%m-%d") for x in groups.min()[groupby]]
try:
df['groupval'] = [x.strftime("%Y-%m-%d") for x in groups.min()[groupby]]
except AttributeError:
df['groupval'] = groups.mean()['days ago'].fillna(value=0)
if userid == 0:
extratitle = ''