Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow to add a workout session directly from the timer view

Roland Geiderac03b8bd4d03
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 0baf9ab01..675fac52d 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -183,15 +183,6 @@ class HelperDateForm(Form):
date = DateField(input_formats=DATE_FORMATS, widget=Html5DateInput())
-class HelperWorkoutSessionForm(ModelForm):
- '''
- A helper form used in the workout log view
- '''
- class Meta:
- model = WorkoutSession
- exclude = ('date', 'user')
-
-
class WorkoutLogForm(ModelForm):
'''
Helper form for a WorkoutLog.
@@ -209,7 +200,30 @@ class WorkoutLogForm(ModelForm):
exclude = ('exercise', )
+class HelperWorkoutSessionForm(ModelForm):
+ '''
+ A helper form used in the workout log view
+ '''
+ class Meta:
+ model = WorkoutSession
+ exclude = ('date', 'user')
+
+
class WorkoutSessionForm(ModelForm):
+ '''
+ Workout Session form
+ '''
+ class Meta:
+ model = WorkoutSession
+ exclude = ('user', )
+
+
+class WorkoutSessionHiddenFieldsForm(ModelForm):
+ '''
+ Workout Session form used in the timer view
+ '''
class Meta:
model = WorkoutSession
- exclude = ('time_start', 'time_end')
+ widgets = {'time_start': widgets.HiddenInput(),
+ 'time_end': widgets.HiddenInput(),
+ 'user': widgets.HiddenInput()}
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.html
index b83a654bb..cc2f34001 100644
--- a/wger/manager/templates/workout/timer.html
+++ b/wger/manager/templates/workout/timer.html
@@ -24,7 +24,7 @@
var div_height = $( window ).height() * 0.80;
var div_width = $( window ).width() * 0.85;
-var start = new Date().getTime();
+var start = new Date();
var counter = {
@@ -208,8 +208,8 @@ $(document).ready(function() {
// If we have reached the last page, compute total workout time
if (next_step.is('#workout-complete'))
{
- var end = new Date().getTime();
- var milliseconds = (end - start);
+ var end = new Date();
+ var milliseconds = (end.getTime() - start.getTime());
var hours = (milliseconds/1000) / 3600;
var minutes = (milliseconds/1000) / 60 - Math.floor(hours)*60;
@@ -219,10 +219,27 @@ $(document).ready(function() {
minutes = (minutes < 10) ? '0' + minutes : minutes;
seconds = (seconds < 10) ? '0' + seconds : seconds;
+ //a.toLocaleTimeString()
$('#total_time').html(Math.floor(hours) + ':' + Math.floor(minutes) + ':' + Math.floor(seconds));
+
+ $('#id_time_start').val(start.getHours() + ':' + start.getMinutes());
+ $('#id_time_end').val(end.getHours() + ':' + end.getMinutes());
+ $('#id_date').val(end.getFullYear() + '-' + end.getMonth() + '-' + end.getDay());
+ $('#id_user').val('1');
}
});
+
+ // Bind the button to save the workout session form
+ $('#save_button_form').bind("click", function(e) {
+ e.preventDefault();
+ console.log($('#session-form').serialize());
+ $.post( $('#session-form').attr('action'),
+ $('#session-form').serialize(),
+ function( data ) {
+ console.log(data);
+ });
+ });
});
</script>
{% endblock %}
@@ -373,17 +390,37 @@ $(document).ready(function() {
<h2>{% trans "Workout complete!" %}</h2>
<div class="filler_div">
+ <form action="{% url 'workout-session-add' workout.id %}" id="session-form">
+ {% csrf_token %}
+
+ {% for field in session_form %}
+ {% yaml_form_field field %}
+ {% endfor %}
+ </form>
</div>
<div class="sub_header">
<h2><strong>{% trans "Time" %}:</strong> <span id="total_time">MM:SS</span></h2>
</div>
- <a class="bottom_button"
- href="{% url 'dashboard' %}"
- data-role="button"
- data-ajax="false"
- data-iconpos="right">{% trans "Dashboard" %}</a>
+ <div class="ui-grid-a bottom_buttons">
+ <div class="ui-block-a">
+ <a href="{% url 'dashboard' %}"
+ data-role="button"
+ data-icon="arrow-r"
+ data-ajax="false"
+ data-iconpos="right">{% trans "Dashboard" %}</a>
+ </div>
+ <div class="ui-block-b">
+ <a href=""
+ id="save_button_form"
+ data-role="button"
+ data-icon="check"
+ data-ajax="false"
+ data-iconpos="right">{% trans "Save" %}</a>
+ </div>
+ </div>
+
<div id="progress-{{step.current_step}}" class="progress-bar">
<span style="width: 100%;"></span>
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index e7e3c3e68..46b4b8b77 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -37,6 +37,7 @@ from wger.manager.models import WorkoutLog
from wger.manager.models import Schedule
from wger.manager.models import Day
from wger.manager.forms import WorkoutForm
+from wger.manager.forms import WorkoutSessionHiddenFieldsForm
from wger.manager.forms import WorkoutCopyForm
from wger.utils.generic_views import WgerFormMixin
@@ -316,6 +317,7 @@ def timer(request, day_pk):
context['step_list'] = step_list
context['canonical_day'] = canonical_day
context['workout'] = day.training
+ context['session_form'] = WorkoutSessionHiddenFieldsForm()
return render_to_response('workout/timer.html',
context,
context_instance=RequestContext(request))
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index 04dcaad4d..bf1327b76 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
import logging
+import datetime
from django.http import HttpResponseForbidden
from django.core.urlresolvers import reverse
@@ -22,6 +23,7 @@ from django.utils.translation import ugettext as _
from django.views.generic import UpdateView
from django.views.generic import CreateView
+from wger.manager.forms import WorkoutSessionForm
from wger.manager.models import Workout, WorkoutSession
@@ -59,6 +61,7 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
Generic view to add a new workout session entry
'''
model = WorkoutSession
+ form_class = WorkoutSessionForm
login_required = True
def dispatch(self, request, *args, **kwargs):
@@ -66,7 +69,7 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
Check for ownership
'''
workout = Workout.objects.get(pk=kwargs['workout_pk'])
- if workout.user != request.user:
+ if workout.get_owner_object().user != request.user:
return HttpResponseForbidden()
return super(WorkoutSessionAddView, self).dispatch(request, *args, **kwargs)
@@ -89,4 +92,5 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
workout = Workout.objects.get(pk=self.kwargs['workout_pk'])
form.instance.workout = workout
form.instance.user = self.request.user
+ form.instance.date = datetime.date.today()
return super(WorkoutSessionAddView, self).form_valid(form)