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

smooth time slider

Browse Source
This commit is contained in:
Sander Roosendaal
2022-10-31 19:29:39 +01:00
parent 9eb65f5b26
commit 79204c0b5b
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/forms.py
View File

@@ -156,9 +156,9 @@ class InstrokeForm(forms.Form):
required=False) required=False)
spm_min = forms.IntegerField(initial=15,label='SPM Min',widget=HiddenInput) spm_min = forms.IntegerField(initial=15,label='SPM Min',widget=HiddenInput)
spm_max = forms.IntegerField(initial=45,label='SPM Max',widget=HiddenInput) spm_max = forms.IntegerField(initial=45,label='SPM Max',widget=HiddenInput)
activeminutesmin = forms.IntegerField( activeminutesmin = forms.FloatField(
required=False, initial=0, widget=forms.HiddenInput()) required=False, initial=0, widget=forms.HiddenInput())
activeminutesmax = forms.IntegerField( activeminutesmax = forms.FloatField(
required=False, initial=0, widget=forms.HiddenInput()) required=False, initial=0, widget=forms.HiddenInput())
notes = forms.CharField(required=False, notes = forms.CharField(required=False,
max_length=200, label='Notes', max_length=200, label='Notes',

6
rowers/interactiveplots.py
View File

@@ -4404,9 +4404,9 @@ def instroke_interactive_chart(df,metric, workout, spm_min, spm_max,
text_color='black', text_color='black',
) )
s2 = 'Time: {activeminutesmin} - {activeminutesmax} min'.format( s2 = 'Time: {activeminutesmin} - {activeminutesmax}'.format(
activeminutesmin=activeminutesmin, activeminutesmin=datetime.timedelta(seconds=60*activeminutesmin),
activeminutesmax=activeminutesmax activeminutesmax=datetime.timedelta(seconds=60*activeminutesmax)
) )
label2 = Label(x=50,y=400, x_units='screen', y_units='screen', label2 = Label(x=50,y=400, x_units='screen', y_units='screen',

23
rowers/templates/instroke_interactive.html
View File

@@ -83,22 +83,29 @@ $( function() {
}); });
</script> </script>
<script> <script>
function secondsToHMS(s) {
var h = Math.floor(s/3600); // Hours
s -= h*3600;
var m = Math.floor(s/60); // Minutes
s -= m*60;
return h+":"+(m < 10 ? '0'+m : m)+":"+(s < 10 ? '0'+s : s); //zero padding on minutes and seconds
}
$( function() { $( function() {
console.log({{ activeminutesmin }}, {{ activeminutesmax}}, 'active range'); console.log({{ activeminutesmin }}, {{ activeminutesmax}}, 'active range');
$( "#slider-timerange" ).slider({ $( "#slider-timerange" ).slider({
range: true, range: true,
min: 0, min: 0,
max: {{ maxminutes }}, max: {{ maxminutes|times60 }},
step: 0.1, step: 1,
values: [ {{ activeminutesmin }}, {{ activeminutesmax }} ], values: [ {{ activeminutesmin|times60 }}, {{ activeminutesmax|times60 }} ],
slide: function( event, ui ) { slide: function( event, ui ) {
$( "#amount" ).val(ui.values[ 0 ] + " min - " + ui.values[ 1 ] + " min " ); $( "#amount" ).val(secondsToHMS(ui.values[ 0 ]) + " - " + secondsToHMS(ui.values[ 1 ]) );
$("#id_activeminutesmin").val(ui.values[0]); $("#id_activeminutesmin").val(ui.values[0]/60);
$("#id_activeminutesmax").val(ui.values[1]); $("#id_activeminutesmax").val(ui.values[1]/60);
} }
}); });
$( "#amount" ).val($( "#slider-timerange" ).slider( "values", 0 ) + $( "#amount" ).val(secondsToHMS($( "#slider-timerange" ).slider( "values", 0 )) +
" min - " + $( "#slider-timerange" ).slider( "values", 1 ) + " min "); " min - " + secondsToHMS($( "#slider-timerange" ).slider( "values", 1 )));
} ); } );
</script> </script>
{% endblock %} {% endblock %}

3
rowers/templatetags/rowerfilters.py
View File

@@ -393,6 +393,9 @@ def aantalcomments(workout):
return aantalcomments return aantalcomments
@register.filter
def times60(s):
return s*60
@register.filter @register.filter
def encode(id): def encode(id):