Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge

Roland Geider79564924722f
diff --cc wger/manager/urls.py
index b98eba0df,d25fd1251..c5f00b8c8
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@@ -73,13 -69,12 +73,18 @@@ urlpatterns = patterns('wger.manager.vi
url(r'^workout/log/edit-entry/(?P<pk>\d+)$',
WorkoutLogUpdateView.as_view(),
name='workout-log-edit'),
+ url(r'^workout/calendar$',
+ 'log.calendar',
+ name='workout-calendar'),
+ url(r'^workout/calendar/(?P<year>\d{4})-(?P<month>\d{1,2})$',
+ 'log.calendar',
+ name='workout-calendar'),
+ # Timer
+ url(r'^workout/(?P<pk>\d+)/timer$',
+ 'workout.timer',
+ name='workout-timer'),
+
# Schedules
url(r'^workout/schedule/overview$',
'schedule.overview',
diff --cc wger/manager/views/workout.py
index 4b738d2d5,17825724e..471f64d21
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@@ -33,7 -33,7 +33,8 @@@ from django.views.generic import Delete
from django.views.generic import UpdateView
from wger.manager.models import Workout
+from wger.manager.models import Schedule
+ from wger.manager.models import Day
from wger.manager.forms import WorkoutForm
from wger.manager.forms import WorkoutCopyForm
diff --cc wger/software/templates/changelog.html
index b91997950,bf228bf8c..7552ae9e7
--- a/wger/software/templates/changelog.html
+++ b/wger/software/templates/changelog.html
@@@ -11,7 -11,7 +11,8 @@@
<h4>2013-XX-XX</h4>
<ul>
+ <li>Calendar view to more easily check workout logs</li>
+ <li>Add "gym mode" with timer to do and log the workout while at the gym<li>
</ul>