diff --git a/core/templates/timer_detail.html b/core/templates/timer_detail.html new file mode 100644 index 00000000..8f842d98 --- /dev/null +++ b/core/templates/timer_detail.html @@ -0,0 +1,19 @@ +{% extends 'babyblotter/page.html' %} + +{% block title %}{{ object }}{% endblock %} + +{% block content %} +
+

{{ object.duration }}

+

Started {{ object.start }} by {{ object.user }}

+ + Feeding + + Sleep + + Tummy Time + + Delete Timer +

+
+{% endblock %} \ No newline at end of file diff --git a/core/templates/timer_nav.html b/core/templates/timer_nav.html index 89b58222..c8fca219 100644 --- a/core/templates/timer_nav.html +++ b/core/templates/timer_nav.html @@ -14,7 +14,7 @@ {% endif %} {% endif %} {% for timer in timers %} - + {{ timer }} {% endfor %} \ No newline at end of file diff --git a/core/urls.py b/core/urls.py index 5c4507f2..6ce299e4 100644 --- a/core/urls.py +++ b/core/urls.py @@ -48,6 +48,8 @@ urlpatterns = [ url(r'timer/add/$', views.TimerAdd.as_view(), name='timer-add'), url(r'timer/add/quick/$', views.TimerAddQuick.as_view(), name='timer-add-quick'), + url(r'timer/(?P[0-9]+)/$', views.TimerDetail.as_view(), + name='timer-detail'), url(r'tummy-time/$', views.TummyTimeList.as_view(), name='tummytime-list'), url(r'tummy-time/add/$', views.TummyTimeAdd.as_view(), diff --git a/core/views.py b/core/views.py index b9a60acf..622f5791 100644 --- a/core/views.py +++ b/core/views.py @@ -5,6 +5,7 @@ from django.core.urlresolvers import resolve from django.contrib.auth.mixins import (LoginRequiredMixin, PermissionRequiredMixin) from django.views.generic.base import TemplateView, RedirectView +from django.views.generic.detail import DetailView from django.views.generic.edit import CreateView, UpdateView, DeleteView from django.views.generic.list import ListView @@ -142,6 +143,12 @@ class SleepDelete(PermissionRequiredMixin, DeleteView): success_url = '/sleep' +class TimerDetail(PermissionRequiredMixin, DetailView): + model = Timer + template_name = 'timer_detail.html' # To be consistent w/Timer templates. + permission_required = ('core.view_timer',) + + class TimerAdd(PermissionRequiredMixin, CreateView): model = Timer permission_required = ('core.add_timer',)