Updated html and added views for sleep details on frontend

shiftypanda · Feb 6, 2018 · d02a68a · d02a68a
1 parent 41b9932
commit d02a68a
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 11 deletions.
diff --git a/sensibdiary/settings.py b/sensibdiary/settings.py
@@ -25,7 +25,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['localhost', '127.0.0.1', '.pythonanywhere.com']
 
 
 # Application definition
@@ -109,7 +109,7 @@
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'GB'
 
 USE_I18N = True
 

diff --git a/sensibdiary/urls.py b/sensibdiary/urls.py
@@ -14,8 +14,9 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import include, path
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('sleep-diary/', include('sleep.urls')),
 ]
diff --git a/sleep/models.py b/sleep/models.py
@@ -71,7 +71,7 @@ def __str__(self):
 
 
 class SleepInterruption(models.Model):
-    sleep_date = models.ForeignKey(Sleep, on_delete=models.CASCADE)
+    sleep_date = models.ForeignKey(Sleep, on_delete=models.CASCADE, related_name='interruptions')
 
     interruption_time = models.TimeField('time woke during sleep')
 

diff --git a/sleep/static/templates/css/sleep.css b/sleep/static/templates/css/sleep.css
@@ -1,13 +1,15 @@
-.page-header {
-  background-color: teal;
+.base-header {
+
   margin-top: 0;
   padding: 20px 20px 20px 40px;
+  background-color: teal;
 }
 
 .page-header h1, .page-header h1 a, .page-header h1 a:visited, .page-header h1 a:active {
   color: #ffffff;
   font-size: 36pt;
   text-decoration: none;
+
 }
 
 .content {

diff --git a/sleep/static/templates/sleep/base.html → sleep/templates/sleep/base.html b/sleep/static/templates/sleep/base.html → sleep/templates/sleep/base.html
@@ -6,19 +6,19 @@
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
     <link href="//fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" href="{% static 'css/sleep.css' %}">
+    <link rel="stylesheet" href="{% static 'templates/css/sleep.css' %}">
   </head>
   <body>
-    <div class"page-header">
-      #<!-- TODO: Nav menu here for authenticated users -->
+    <div class"base-header">
+      <!-- TODO: Nav menu here for authenticated users -->
       <!-- TODO: Nav menu here for anonymous users / login redirect -->
 
       <h1><a href="/">SenSibDiary</a></h1>
     </div>
     <div class="content container">
       <div class="row">
         <div class="col-md-8">
-          {% blockcontent %}
+          {% block content %}
           {% endblock%}
         </div>
       </div>

diff --git a/sleep/templates/sleep/detail.html b/sleep/templates/sleep/detail.html
@@ -0,0 +1,24 @@
+{% extends 'sleep/base.html' %}
+  {% block content %}
+
+  <h1 class="sleep-detail">{{ sleep.sleep_date|date:'d-m-Y'}}</h1>
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+      <div class="sleep">
+        <p class="date">Sleep date: {{ sleep.sleep_date|date:'d-m-Y'}}</p>
+        <div class="sleep-detail">
+          <table>
+          <tr>
+            <td>Time started preparing for bed: {{ sleep.time_start_preparing_for_sleep|date:'H:i e'}}</tr>
+          <tr>
+            <td>Time went to bed: {{ sleep.time_went_into_bed|date:'H:i e' }}</tr>
+          <tr>
+            <td>Time went to sleep: {{ sleep.time_went_to_sleep|date:'H:i e'}}</tr>
+          <div class="sleep-divider"></div>
+          <tr>
+            <td>Time woke in the morning: {{ sleep.time_woke_in_morning|date:'H:i e'}}</tr>
+        </table>
+      </div>
+      </div>
+
+
+  {% endblock %}
diff --git a/sleep/templates/sleep/index.html b/sleep/templates/sleep/index.html
@@ -0,0 +1,10 @@
+{% extends 'sleep/base.html' %}
+  {% block content %}
+    {% for sleep in latest_sleeps_lists %}
+
+        <p class="date">Sleep date: {{ sleep.sleep_date|date:'d-m-Y'}}</p>
+          <div class="sleep-divider"></div>
+
+      {% endfor %}
+
+  {% endblock %}
diff --git a/sleep/urls.py b/sleep/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+
+from . import views
+
+app_name = 'sleep'
+urlpatterns = [
+    path('', views.IndexView.as_view(), name='index'),
+    path('<int:pk>/', views.DetailView.as_view(), name='detail')
+]
diff --git a/sleep/views.py b/sleep/views.py
@@ -1,3 +1,34 @@
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
+from django.http import HttpResponseRedirect
+from django.utils import timezone
+from django.contrib.auth.decorators import login_required
+from django.views import generic
+from django.urls import reverse
 
+
+from .models import Sleep, SleepInterruption
 # Create your views here.
+
+
+class IndexView(generic.ListView):
+    template_name = 'sleep/index.html'
+    context_object_name = 'latest_sleeps_list'
+
+    def get_queryset(self):
+        """
+        Return the last seven sleeps
+        """
+        return Sleep.objects.filter(
+        sleep_date__lte=timezone.now()
+        ).order_by('-sleep_date')[:7]
+
+
+class DetailView(generic.DetailView):
+    model = Sleep
+    template_name ='sleep/detail.html'
+
+    def get_queryset(self):
+        """
+        Excludes any sleeps that haven't completed yet
+        """
+        return Sleep.objects.filter(sleep_date__lte=timezone.now())