From f4ae2595cf66305e2a829e7909b674d775ca7b99 Mon Sep 17 00:00:00 2001
From: liangliang <liangliangyy@gmail.com>
Date: Sat, 10 Mar 2018 20:32:57 +0800
Subject: [PATCH] Fix #88

---
 DjangoBlog/blog_signals.py   |  2 ++
 owntracks/views.py           | 13 ++++++++-----
 requirements.txt             |  2 +-
 travis_test/requirements.txt |  4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/DjangoBlog/blog_signals.py b/DjangoBlog/blog_signals.py
index 8e33bfd..c171821 100644
--- a/DjangoBlog/blog_signals.py
+++ b/DjangoBlog/blog_signals.py
@@ -51,6 +51,8 @@ def article_save_callback(sender, **kwargs):
 @receiver(comment_save_signal)
 def comment_save_callback(sender, **kwargs):
     from comments.models import Comment
+    if settings.DEBUG:
+        return
 
     serverport = kwargs['serverport']
     username = kwargs['username']
diff --git a/owntracks/views.py b/owntracks/views.py
index 0251e2e..8af2de9 100644
--- a/owntracks/views.py
+++ b/owntracks/views.py
@@ -54,7 +54,7 @@ def show_maps(request):
 @login_required
 def show_log_dates(request):
     dates = OwnTrackLog.objects.values_list('created_time', flat=True)
-    results = list(set(map(lambda x: x.strftime('%Y-%m-%d'), dates)))
+    results = list(sorted(set(map(lambda x: x.strftime('%Y-%m-%d'), dates))))
 
     context = {
         'results': results
@@ -63,7 +63,7 @@ def show_log_dates(request):
 
 
 def convert_to_amap(locations):
-    datas = ';'.join(map(lambda x: str(x.lon) + ',' + str(x.lat), locations))
+    datas = ';'.join(set(map(lambda x: str(x.lon) + ',' + str(x.lat), locations)))
 
     key = '8440a376dfc9743d8924bf0ad141f28e'
     api = 'http://restapi.amap.com/v3/assistant/coordinate/convert'
@@ -80,11 +80,14 @@ def convert_to_amap(locations):
 
 @login_required
 def get_datas(request):
-    now = datetime.datetime.now()
-    querydate = datetime.datetime(now.year, now.month, now.day, 0, 0, 0)
+    import django.utils.timezone
+    from django.utils.timezone import utc
+
+    now = django.utils.timezone.now().replace(tzinfo=utc)
+    querydate = django.utils.timezone.datetime(now.year, now.month, now.day, 0, 0, 0)
     if request.GET.get('date', None):
         date = list(map(lambda x: int(x), request.GET.get('date').split('-')))
-        querydate = datetime.datetime(date[0], date[1], date[2], 0, 0, 0)
+        querydate = django.utils.timezone.datetime(date[0], date[1], date[2], 0, 0, 0)
     nextdate = querydate + datetime.timedelta(days=1)
     models = OwnTrackLog.objects.filter(created_time__range=(querydate, nextdate))
     result = list()
diff --git a/requirements.txt b/requirements.txt
index beb7a24..637b9a8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ bottle==0.12.13
 certifi==2018.1.18
 chardet==3.0.4
 coverage==4.5.1
-Django==2.0.2
+Django==2.0.3
 django-appconf==1.0.2
 django-autoslug==1.9.3
 django-compressor==2.2
diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt
index c2b4583..45777d0 100644
--- a/travis_test/requirements.txt
+++ b/travis_test/requirements.txt
@@ -3,7 +3,7 @@ bottle==0.12.13
 certifi==2018.1.18
 chardet==3.0.4
 coverage==4.5.1
-Django==2.0.2
+Django==2.0.3
 django-appconf==1.0.2
 django-autoslug==1.9.3
 django-compressor==2.2
@@ -18,7 +18,7 @@ jsonpickle==0.9.6
 markdown2==2.3.5
 mistune==0.8.3
 olefile==0.45.1
-packaging==16.8
+packaging==17.1
 Pillow==5.0.0
 Pygments==2.2.0
 PyMySQL==0.8.0