fix log.date
This commit is contained in:
		@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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) \
 | 
			
		||||
 | 
			
		||||
@ -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 %}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user