diff --git a/main/views.py b/main/views.py index 662b762..363947e 100644 --- a/main/views.py +++ b/main/views.py @@ -29,11 +29,13 @@ def home(request): def log(request): entry_list = Entry.objects.raw("SELECT id, user, COUNT( * ) as entries, DATE( created ) AS date FROM `main_entry` GROUP BY user, DATE( created )") - start = datetime.strptime(min(entry_list).date, '%Y-%m-%d') - entry_list = [ (e.user,e.date,e.entries) for e in entry_list] + if isinstance(entry_list[0].date, unicode): + entry_list = [ (e.user,e.date,e.entries) for e in entry_list] + else: + # In Django trunk dates in raw queries are recognized and converted to datetime objects + entry_list = [ (e.user,e.date.strftime("%Y-%m-%d"),e.entries) for e in entry_list] #LORD! per_user = {} - i = 0 for user, date, es in entry_list: data = (date, es) diff --git a/static/js/snurr.js b/static/js/snurr.js index bea1863..8ddac1e 100644 --- a/static/js/snurr.js +++ b/static/js/snurr.js @@ -55,7 +55,7 @@ $(document).ready(function() { }, series: [] }; - var url = 'http://localhost:8000/log/'; + var url = '/log/'; $.getJSON(url, function(data) { $.each(data, function(user, val) { diff --git a/urls.py b/urls.py index bc8b987..6a8d2ee 100644 --- a/urls.py +++ b/urls.py @@ -12,4 +12,4 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), ) -#urlpatterns += staticfiles_urlpatterns() +urlpatterns += staticfiles_urlpatterns()