From 1ae44c408f7e3f9d13b04e4e251c7bd575ce1021 Mon Sep 17 00:00:00 2001
From: Christopher Charbonneau Wells <chris@chrxs.net>
Date: Sat, 9 Sep 2017 11:54:34 -0400
Subject: [PATCH] Add timers list.

---
 babyblotter/templates/babyblotter/page.html |  9 ----
 core/templates/core/timer_list.html         | 48 ++++++++++++++++-----
 core/templates/core/timer_nav.html          | 15 +++++--
 core/templatetags/timers.py                 |  7 ---
 core/urls.py                                |  1 +
 core/views.py                               |  5 +++
 6 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/babyblotter/templates/babyblotter/page.html b/babyblotter/templates/babyblotter/page.html
index b3868dea..687cab5e 100644
--- a/babyblotter/templates/babyblotter/page.html
+++ b/babyblotter/templates/babyblotter/page.html
@@ -8,15 +8,6 @@
             <div class="col-lg-12 mb-4">
                 {% block content %}{% endblock %}
             </div>
-            {% if false and perms.core.view_timer %}
-                <div class="col-lg-2">
-                    <h1>Timers</h1>
-                    {% if perms.core.add_timer %}
-                        {% add_timer request.path %}
-                    {% endif %}
-                    {% list_timers %}
-                </div>
-            {% endif %}
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/timer_list.html b/core/templates/core/timer_list.html
index 44f8baa5..6185c8a2 100644
--- a/core/templates/core/timer_list.html
+++ b/core/templates/core/timer_list.html
@@ -1,11 +1,39 @@
-{% for timer in timers %}
-    <div class="card border-success text-center mb-2">
-        <div class="card-header text-white bg-success ">{{ timer.name }}</div>
-        <div class="card-body text-success">
-            <h4 class="card-text">{{ timer.current_duration }}</h4>
-        </div>
-        <div class="card-footer text-muted small">
-            {{ timer.start }}
-        </div>
+{% extends 'babyblotter/page.html' %}
+{% load widget_tweaks %}
+{% load duration %}
+
+{% block title %}Sleep{% endblock %}
+
+{% block content %}
+    <h1>Timers</h1>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead class="thead-inverse">
+            <tr>
+                <th>Name</th>
+                <th>Start</th>
+                <th>End</th>
+                <th>Duration</th>
+                <th>Active</th>
+                <th>User</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for timer in object_list %}
+                <tr>
+                    <th scope="row"><a href="{% url 'timer-detail' timer.id %}">{{ timer }}</a></th>
+                    <td>{{ timer.start }}</td>
+                    <td>{{ timer.end }}</td>
+                    <td>{{ timer.duration|duration_string }}</td>
+                    <td>{{ timer.active }}</td>
+                    <td>{{ timer.user }}</td>
+                </tr>
+            {% empty %}
+                <tr>
+                    <th colspan="7">No timer entries found.</th>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
     </div>
-{% endfor %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/timer_nav.html b/core/templates/core/timer_nav.html
index e868a7ea..f00f6dc0 100644
--- a/core/templates/core/timer_nav.html
+++ b/core/templates/core/timer_nav.html
@@ -8,13 +8,20 @@
     <div class="dropdown-menu" aria-labelledby="nav-timer-menu-link">
         {% if perms.core.add_timer %}
             <a class="dropdown-item" href="{% url 'timer-add-quick' %}">
-                <i class="fa fa-plus" aria-hidden="true"></i> Create Timer
+                <i class="fa fa-clock-o" aria-hidden="true"></i> Quick Start Timer
+            </a>
+            <a class="dropdown-item" href="{% url 'timer-add' %}">
+                <i class="fa fa-plus" aria-hidden="true"></i> Start Timer
+            </a>
+        {% endif %}
+        {% if perms.core.view_timer %}
+            <a class="dropdown-item" href="{% url 'timer-list' %}">
+                <i class="fa fa-list" aria-hidden="true"></i> View Timers
             </a>
-            {% if timers %}
-                <div class="dropdown-divider"></div>
-            {% endif %}
         {% endif %}
         {% for timer in timers %}
+            <div class="dropdown-divider"></div>
+            <h6 class="dropdown-header">Active Timers</h6>
             <a class="dropdown-item" href="{% url 'timer-detail' timer.id %}">{{ timer }}</a>
         {% endfor %}
     </div>
diff --git a/core/templatetags/timers.py b/core/templatetags/timers.py
index f3d6f196..9d4fd24e 100644
--- a/core/templatetags/timers.py
+++ b/core/templatetags/timers.py
@@ -9,13 +9,6 @@ from core.models import Timer
 register = template.Library()
 
 
-@register.inclusion_tag('core/timer_list.html', takes_context=True)
-def list_timers(context, active=True):
-    request = context['request'] or None
-    timers = Timer.objects.filter(user=request.user, active=active)
-    return {'timers': timers}
-
-
 @register.inclusion_tag('core/timer_nav.html', takes_context=True)
 def timer_nav(context, active=True):
     request = context['request'] or None
diff --git a/core/urls.py b/core/urls.py
index e9b50c8d..9f0df7f5 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -47,6 +47,7 @@ urlpatterns = [
     url(r'^sleep/(?P<pk>[0-9]+)/delete/$', views.SleepDelete.as_view(),
         name='sleep-delete'),
 
+    url(r'^timers/$', views.TimerList.as_view(), name='timer-list'),
     url(r'^timer/add/$', views.TimerAdd.as_view(), name='timer-add'),
     url(r'^timer/add/quick/$', views.TimerAddQuick.as_view(),
         name='timer-add-quick'),
diff --git a/core/views.py b/core/views.py
index 4c2a21a6..94600c9c 100644
--- a/core/views.py
+++ b/core/views.py
@@ -152,6 +152,11 @@ class SleepDelete(PermissionRequiredMixin, DeleteView):
     success_url = '/sleep'
 
 
+class TimerList(PermissionRequiredMixin, ListView):
+    model = Timer
+    permission_required = ('core.view_timer',)
+
+
 class TimerDetail(PermissionRequiredMixin, DetailView):
     model = Timer
     permission_required = ('core.view_timer',)