From 4065285953b76a0dd6474f1bda2379d138268110 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 12 Aug 2015 21:32:16 +0200
Subject: [PATCH] So much tz

---
 apps/kassa/views.py | 13 +++++++++----
 requirements.txt    |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/kassa/views.py b/apps/kassa/views.py
index 5f940be..d33c0ca 100644
--- a/apps/kassa/views.py
+++ b/apps/kassa/views.py
@@ -2,7 +2,8 @@
 from __future__ import unicode_literals
 from itertools import groupby
 import json
-from datetime import date
+import pytz as pytz
+from django.utils import timezone
 from apps.kassa.models import KassaEvent
 
 from django.conf import settings
@@ -151,11 +152,15 @@ def register_card_and_membership(request):
 
 def stats_card_sales(request):
     sale_events = [KassaEvent.ADD_OR_RENEW, KassaEvent.NEW_CARD_MEMBERSHIP]
+
     # TODO filter by start HTTP param
-    start_date = date(year=2015, month=8, day=1)
+    start_date = timezone.datetime(year=2015, month=8, day=1)
+    start_date = pytz.timezone(timezone.get_current_timezone_name()).localize(start_date)
+
     events = KassaEvent.objects.filter(event__in=sale_events, created__gte=start_date).values_list('created')
     grouped = []
-    for key, values in groupby(events, key=lambda row: row[0].date()):
-        grouped.append({'date': key.isoformat(), 'sales': len(list(values))})
+    date_format = '%Y-%m-%d'
+    for key, values in groupby(events, key=lambda row: row[0].strftime(date_format)):
+        grouped.append({'date': key, 'sales': len(list(values))})
 
     return JsonResponse({'memberships': grouped})
diff --git a/requirements.txt b/requirements.txt
index 664b054..3d651b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,5 @@ mysqlclient==1.3.6
 ndg-httpsclient==0.4.0
 pyasn1==0.1.8
 pyOpenSSL==0.15.1
+pytz==2015.4
 requests==2.7.0