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

Merge branch 'release/v12.28'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-06 22:17:57 +02:00
parent 754b1fcaaa 86eea03db2
commit f4c2297547
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/views/analysisviews.py
View File

@@ -4706,7 +4706,8 @@ def history_view(request,userid=0):
typechoices = [("All","All")] typechoices = [("All","All")]
for wtype in wtypes: for wtype in wtypes:
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype])) if wtype in mytypes.checktypes:
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
form.fields['workouttype'].choices = typechoices form.fields['workouttype'].choices = typechoices
@@ -4730,7 +4731,7 @@ def history_view(request,userid=0):
# interactive hr pie chart # interactive hr pie chart
totalscript = '' totalscript = ''
totaldiv = get_call() totaldiv = get_call()
totalsdict = {} totalsdict = {}
totalsdict['duration'] = "{totalhours}:{totalminutes}".format( totalsdict['duration'] = "{totalhours}:{totalminutes}".format(
totalhours=totalhours, totalhours=totalhours,
@@ -4837,7 +4838,8 @@ def history_view_data(request,userid=0):
typechoices = [("All","All")] typechoices = [("All","All")]
for wtype in wtypes: for wtype in wtypes:
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype])) if wtype in mytypes.checktypes:
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
listofdicts = [] listofdicts = []