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

moved some of form to chart

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-02 22:26:17 +02:00
parent 59b523de3f
commit ac0d2bc504
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/forms.py
View File

@@ -1870,14 +1870,6 @@ class ForceCurveOptionsForm(forms.Form):
notes = forms.CharField(initial="", label='notes', widget=HiddenInput, required=False) notes = forms.CharField(initial="", label='notes', widget=HiddenInput, required=False)
plotchoices = (
('line', 'Force Curve Collection Plot'),
('scatter', 'Peak Force Scatter Plot'),
('none', 'Only aggregrate data')
)
plottype = forms.ChoiceField(choices=plotchoices, initial='line',
label='Individual Stroke Chart Type')
name = forms.CharField(initial="", label='Name',required=False) name = forms.CharField(initial="", label='Name',required=False)

2
rowers/interactiveplots.py
View File

@@ -534,7 +534,7 @@ def interactive_forcecurve(theworkouts, workstrokesonly=True, plottype='scatter'
columns = ['catch', 'slip', 'wash', 'finish', 'averageforce', columns = ['catch', 'slip', 'wash', 'finish', 'averageforce',
'peakforceangle', 'peakforce', 'spm', 'distance', 'peakforceangle', 'peakforce', 'spm', 'distance',
'workoutstate', 'driveenergy'] 'workoutstate', 'driveenergy', 'cumdist']
rowdata = dataprep.getsmallrowdata_db(columns, ids=ids, rowdata = dataprep.getsmallrowdata_db(columns, ids=ids,
workstrokesonly=workstrokesonly) workstrokesonly=workstrokesonly)

4
rowers/templates/forcecurve_single.html
View File

@@ -25,8 +25,8 @@
<form enctype="multipart/form-data" action="" method="post"> <form enctype="multipart/form-data" action="" method="post">
{% csrf_token %} {% csrf_token %}
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
<div class="buttoncontainer"> <div class="buttoncontainer">
<input name="chartform" type="submit" class="button" <input name="chartform" type="submit" class="button"
value="Update Chart"> value="Update Chart">

5
rowers/views/workoutviews.py
View File

@@ -448,10 +448,8 @@ def workout_forcecurve_view(request, id=0, analysis=0, userid=0, workstrokesonly
'work_min': work_min, 'work_min': work_min,
'work_max': work_max, 'work_max': work_max,
'notes': notes, 'notes': notes,
'plottype': 'line',
'name': name, 'name': name,
}) })
plottype = 'line'
if request.method == 'POST': if request.method == 'POST':
@@ -468,7 +466,6 @@ def workout_forcecurve_view(request, id=0, analysis=0, userid=0, workstrokesonly
if not name: if not name:
name = row.name name = row.name
includereststrokes = form.cleaned_data['includereststrokes'] includereststrokes = form.cleaned_data['includereststrokes']
plottype = form.cleaned_data['plottype']
workstrokesonly = not includereststrokes workstrokesonly = not includereststrokes
if "_save" in request.POST and "new" not in request.POST: # pragma: no cover if "_save" in request.POST and "new" not in request.POST: # pragma: no cover
@@ -523,13 +520,11 @@ def workout_forcecurve_view(request, id=0, analysis=0, userid=0, workstrokesonly
else: # pragma: no cover else: # pragma: no cover
workstrokesonly = True workstrokesonly = True
plottype = 'line'
script, div = interactive_forcecurve( script, div = interactive_forcecurve(
[row], [row],
workstrokesonly=workstrokesonly, workstrokesonly=workstrokesonly,
plottype=plottype,
dist_min = dist_min, dist_min = dist_min,
dist_max = dist_max, dist_max = dist_max,
spm_min = spm_min, spm_min = spm_min,