From 371bf1e73c6c6a923a2a631de56b75fda1120133 Mon Sep 17 00:00:00 2001
From: bkfox <thomas bkfox net>
Date: Fri, 22 May 2020 15:17:59 +0200
Subject: [PATCH] fix log.date

---
 aircox/models/episode.py                 | 10 +++++-----
 aircox/models/log.py                     |  7 ++++++-
 aircox/templates/aircox/page_detail.html |  9 +++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/aircox/models/episode.py b/aircox/models/episode.py
index 7ab15c0..dc0f317 100644
--- a/aircox/models/episode.py
+++ b/aircox/models/episode.py
@@ -71,11 +71,11 @@ class DiffusionQuerySet(BaseRerunQuerySet):
         qs = self.filter(start__lte=now, end__gte=now).distinct()
         return qs.order_by('start') if order else qs
 
-    def date(self, today=None, order=True):
-        """ Diffusions occuring today. """
-        today = today or datetime.date.today()
-        start = tz.datetime.combine(today, datetime.time())
-        end = tz.datetime.combine(today, datetime.time(23, 59, 59, 999))
+    def date(self, date=None, order=True):
+        """ Diffusions occuring date. """
+        date = date or datetime.date.date()
+        start = tz.datetime.combine(date, datetime.time())
+        end = tz.datetime.combine(date, datetime.time(23, 59, 59, 999))
         qs = self.filter(start__range = (start, end))
         return qs.order_by('start') if order else qs
 
diff --git a/aircox/models/log.py b/aircox/models/log.py
index 157079c..6ed4827 100644
--- a/aircox/models/log.py
+++ b/aircox/models/log.py
@@ -1,4 +1,5 @@
 from collections import deque
+import datetime
 import logging
 import os
 
@@ -25,7 +26,11 @@ class LogQuerySet(models.QuerySet):
                self.filter(station_id=id)
 
     def date(self, date):
-        return self.filter(date__date=date)
+        start = tz.datetime.combine(date, datetime.time())
+        end = tz.datetime.combine(date, datetime.time(23, 59, 59, 999))
+        return self.filter(start__range = (start, end))
+        # this filter does not work with sql
+        # return self.filter(date__date=date)
 
     def after(self, date):
         return self.filter(date__gte=date) \
diff --git a/aircox/templates/aircox/page_detail.html b/aircox/templates/aircox/page_detail.html
index 26b4138..12a4310 100644
--- a/aircox/templates/aircox/page_detail.html
+++ b/aircox/templates/aircox/page_detail.html
@@ -8,17 +8,14 @@ Context:
 - page: page
 {% endcomment %}
 
-{% if page.category %}
 {% block header_meta %}{{ block.super }}
 <span class="column has-text-right">
-    {% if object.category %}
-    {{ object.category.title }} //
+    {% if page.category %}
+    {{ page.category.title }} //
     {% endif %}
-    {{ object.pub_date }}
+    {{ page.pub_date }}
 </span>
 {% endblock %}
-{% endif %}
-
 
 {% block main %}
 {% block content %}