diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/templates/stats.html | 8 | ||||
| -rw-r--r-- | backend/urls.py | 2 | ||||
| -rw-r--r-- | backend/views.py | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/backend/templates/stats.html b/backend/templates/stats.html index b427c67..dfa2146 100644 --- a/backend/templates/stats.html +++ b/backend/templates/stats.html @@ -8,23 +8,23 @@ <b>uptime</b> {{ uptime }}<br/> <b>videos</b> {{ videos_total }} ({{ videos_today }} today)<br/> <b>likes</b> {{ likes_total }} ({{ likes_today }} today)<br/> - <b>users</b> {{ users_total }} ({{ users_today }} today, {{ new_users_today }} new)<br/> + <b>users</b> {{ users_total }} ({{ users_today|length }} today, {{ new_users_today|length }} new)<br/> <b>rooms</b> {{ rooms_total }}<br/> <b>in main room now</b> {% for user in users_in_main_room %} - <a target='_blank' href='http://scannerjammer.com/profile/{{ user }}'>{{ user }}</a> + <a target='_blank' href='http://scannerjammer.com/profile/{{ user }}'>{{ user.username }}</a> {% endfor %} </br> <b>main room peak</b> {{ main_room_peak }}<br/> <br/> <b>new today</b><br/> {% for user in new_users_today %} - <a target='_blank' href='http://scannerjammer.com/profile/{{ user }}'>{{ user }}</a> + <a target='_blank' href='http://scannerjammer.com/profile/{{ user }}'>{{ user.username }}</a> {% endfor %} <br/><br/> <b>visitors today</b><br/> {% for user in users_today %} - <a target='_blank' href='http://scannerjammer.com/profile/{{ user }}'>{{ user }}</a> + <a target='_blank' href='http://scannerjammer.com/profile/{{ user }}'>{{ user.username }}</a> {% endfor %} <br/><br/> <br/> diff --git a/backend/urls.py b/backend/urls.py index aa51997..a7f884b 100644 --- a/backend/urls.py +++ b/backend/urls.py @@ -32,6 +32,6 @@ urlpatterns = patterns('backend.views', url(r'^video/unlike/$' , 'api_video_unlike' ), url(r'^video/remove/$' , 'api_video_remove' ), url(r'^video/search/$' , 'api_video_search' ), - # + # STATISTICS url(r'^stats/$' , 'stats' ), ) diff --git a/backend/views.py b/backend/views.py index 383c487..8d28674 100644 --- a/backend/views.py +++ b/backend/views.py @@ -1061,16 +1061,16 @@ def stats(request): """ View statistics """ uptime = str(datetime.now() - settings.START_TIME) - videos_today = None - videos_total = None - likes_today = None - likes_total = None - users_total = None - users_today = None - users_in_main_room = None - new_users_today = None - rooms_total = None - main_room_peak = None + videos_today = SJContent.objects.filter(content_type='video', datetime__gt=yesterday_datetime()).count() + videos_total = SJContent.objects.filter(content_type='video').count() + likes_today = SJLike.objects.filter(content__content_type='video', datetime__gt=yesterday_datetime()).count() + likes_total = SJLike.objects.filter(content__content_type='video').count() + users_total = auth.models.User.objects.filter(is_active=True).count() + users_today = auth.models.User.objects.filter(is_active=True, last_login__gt=yesterday_datetime()) + users_in_main_room = auth.models.User.objects.filter(sjroom__name='main', sjuserprofile__lastseen_chat__gt=lastseen_datetime()) + new_users_today = auth.models.User.objects.filter(is_active=True, date_joined__gt=yesterday_datetime()).order_by('-date_joined') + rooms_total = SJRoom.objects.all().count() + main_room_peak = auth.models.User.objects.filter(sjroom__name='main').count() return render_to_response('stats.html', {'users_total': users_total, 'users_today': users_today, 'new_users_today': new_users_today, |