Cleanups and fixes.

This commit is contained in:
nikolark committed 2011-10-31 02:25:08 +01:00
1 parent 916f878aa3
commit b4230116b5
3 files changed
+7 -5

No files matched your search

+5 -3
View File
@@ -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)
+1 -1
View File
@@ -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) {
+1 -1
View File
@@ -12,4 +12,4 @@ urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
)
#urlpatterns += staticfiles_urlpatterns()
urlpatterns += staticfiles_urlpatterns()