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

bug fix, and some additions

Browse Source 
Reviewed bug allowing database to be queried on non-existing columns.
Looks like a freak bug and code to prevent it was already in place. Not
sure what happened to trigger the bug on the production server. Wait for
another occurence, then solve.
Added Flex Chart as a button on the left panel. Added Workflow
configuration to the User Settings page
This commit is contained in:
Sander Roosendaal
2017-10-25 11:29:19 +02:00
parent 769179044e
commit e3b5cc1aa8
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/interactiveplots.py
View File

@@ -2170,7 +2170,10 @@ def interactive_flex_chart2(id=0,promember=0,
if yparam1 == 'pace': if yparam1 == 'pace':
y_axis_type = 'datetime' y_axis_type = 'datetime'
try:
y1mean = rowdata.ix[:,'pace'].mean() y1mean = rowdata.ix[:,'pace'].mean()
except KeyError:
y1mean = 0
rowdata['xname'] = axlabels[xparam] rowdata['xname'] = axlabels[xparam]

2
rowers/templates/favoritecharts.html
View File

@@ -6,7 +6,7 @@
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
<div class="grid_12 alpha"> <div class="grid_12 alpha">
<div class="grid_4 fav-form-header"> <div class="grid_4 alpha fav-form-header">
<p><input type="submit" value="Update Favorites" class="button green small"/></p> <p><input type="submit" value="Update Favorites" class="button green small"/></p>
</div> </div>
</div> </div>

5
rowers/templates/panel_flexchart.html Normal file
View File

@@ -0,0 +1,5 @@
<div class="grid_2 alpha">
<p>
<a class="button gray small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex Chart</a>
</p>
</div>

10
rowers/templates/rower_form.html
View File

@@ -170,7 +170,7 @@
</div> </div>
</div> </div>
<div class="grid_12 alpha"> <div class="grid_12 alpha">
<div class="grid_6 suffix_6 alpha"> <div class="grid_6 alpha">
<p> <p>
<h2>Export Settings</h2> <h2>Export Settings</h2>
<div class="grid_2 suffix_4 alpha"> <div class="grid_2 suffix_4 alpha">
@@ -178,6 +178,14 @@
</div> </div>
</p> </p>
</div> </div>
<div class="grid_6 omega">
<p>
<h2>Configure Workflow Layout</h2>
<div class="grid_2 suffix_4 alpha">
<a class="button gray small" href="/rowers/me/workflowconfig2">Manage Workflow Layout</a>
</div>
</p>
</div>
</div> </div>

1
rowers/utils.py
View File

@@ -35,6 +35,7 @@ workflowleftpanel = (
('panel_advancededit.html','Advanced Workout Edit Button'), ('panel_advancededit.html','Advanced Workout Edit Button'),
('panel_editintervals.html','Edit Intervals Button'), ('panel_editintervals.html','Edit Intervals Button'),
('panel_stats.html','Workout Statistics Button'), ('panel_stats.html','Workout Statistics Button'),
('panel_flexchart.html','Flex Chart'),
('panel_staticchart.html','Create Static Charts Buttons'), ('panel_staticchart.html','Create Static Charts Buttons'),
('panel_geekyheader.html','Geeky Header'), ('panel_geekyheader.html','Geeky Header'),
('panel_editwind.html','Edit Wind Data'), ('panel_editwind.html','Edit Wind Data'),

1
rowers/views.py
View File

@@ -8555,7 +8555,6 @@ def rower_favoritecharts_view(request):
if favorites_formset.is_valid(): if favorites_formset.is_valid():
new_instances = [] new_instances = []
for favorites_form in favorites_formset: for favorites_form in favorites_formset:
print 'mies'
yparam1 = favorites_form.cleaned_data.get('yparam1') yparam1 = favorites_form.cleaned_data.get('yparam1')
yparam2 = favorites_form.cleaned_data.get('yparam2') yparam2 = favorites_form.cleaned_data.get('yparam2')
xparam = favorites_form.cleaned_data.get('xparam') xparam = favorites_form.cleaned_data.get('xparam')