From 7ba85f29d4e83be33c051c6c95b7550a9cef8cca Mon Sep 17 00:00:00 2001 From: Christopher Charbonneau Wells Date: Tue, 22 Aug 2017 21:37:10 -0400 Subject: [PATCH] Continue initial attempt at sleep graph (WIP). --- reports/templates/reports/sleep.html | 84 ++++++++++++++++------------ reports/views.py | 37 +++++++++++- 2 files changed, 83 insertions(+), 38 deletions(-) diff --git a/reports/templates/reports/sleep.html b/reports/templates/reports/sleep.html index ead68924..099878da 100644 --- a/reports/templates/reports/sleep.html +++ b/reports/templates/reports/sleep.html @@ -7,42 +7,54 @@ Sleep report for {{ object }}. -
- 8 Aug + 
{{ stats|pprint }}
+ +
+
+ Tuesday, 22 Aug. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 7 Aug -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+
+ Monday, 21 Aug. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% endblock %} \ No newline at end of file diff --git a/reports/views.py b/reports/views.py index a7e5179b..ff32bb66 100644 --- a/reports/views.py +++ b/reports/views.py @@ -1,14 +1,47 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals +from collections import OrderedDict + from django.contrib.auth.mixins import PermissionRequiredMixin +from django.utils import timezone from django.views.generic.detail import DetailView -from core.models import Child +from core.models import Child, Sleep class SleepReport(PermissionRequiredMixin, DetailView): - """TODO: Account for sleep sessions crossing midnight.""" + """All sleep data for a child.""" model = Child permission_required = ('core.view_child',) template_name = 'reports/sleep.html' + + def get_context_data(self, **kwargs): + context = super(SleepReport, self).get_context_data(**kwargs) + child = context['object'] + + sleep_entries = Sleep.objects.filter(child=child).order_by('-end') + diff = timezone.localtime().date() - timezone.localtime(sleep_entries.last().end).date() + stats = OrderedDict() + for x in range(0, diff.days + 1): + key = (timezone.localtime() - timezone.timedelta(days=x)) + stats[key.date()] = [] + + last = None + for entry in sleep_entries: + start = timezone.localtime(entry.start) + end = timezone.localtime(entry.end) + + if not stats[end.date()]: + last = end.replace(hour=23, minute=59, second=59) + + # TODO: Account for sleep sessions crossing midnight. + stats[start.date()].append(( + (last - end).seconds/86400 * 100, + (end - start).seconds/86400 * 100 + )) + last = start + + context['stats'] = stats + + return context