Adding views

tracking/managers.py

@@ -1,13 +1,16 @@
 from __future__ import division
 
+import logging
+
 from datetime import timedelta
 from django.utils import timezone
 from django.contrib.auth import get_user_model
 from django.db import models
-from django.db.models import Count, Avg
+from django.db.models import Count, Avg, Sum, Max
 from tracking.settings import TRACK_PAGEVIEWS, TRACK_ANONYMOUS_USERS
 from tracking.cache import CacheManager
 
+log = logging.getLogger(__file__)
 
 class VisitorManager(CacheManager):
     def active(self, registered_only=True):
@@ -163,25 +166,18 @@ def user_stats(self, start_date=None, end_date=None):
         else:
             user_kwargs['visit_history__start_time__isnull'] = False
             visit_kwargs['start_time__isnull'] = False
-
-        users = list(get_user_model().objects.filter(**user_kwargs).annotate(
-            visit_count=Count('visit_history'),
+            
+        users = get_user_model().objects.filter(**user_kwargs).annotate(
+            visit_count=Count('visit_history', distinct=True),
             time_on_site=Avg('visit_history__time_on_site'),
+            page_count=Count('visit_history__pageviews', distinct=True),
+            pages_per_visit=Count('visit_history__pageviews', distinct=True)/Count('visit_history', distinct=True),
+            last_pageview=Max('visit_history__pageviews__view_time'),
         ).filter(visit_count__gt=0).order_by(
             '-time_on_site',
             get_user_model().USERNAME_FIELD,
-        ))
-
-        # Aggregate pageviews per visit
-        for user in users:
-            user.pages_per_visit = user.visit_history.filter(
-                **visit_kwargs
-            ).annotate(
-                page_count=Count('pageviews')
-            ).filter(page_count__gt=0).aggregate(
-                pages_per_visit=Avg('page_count'))['pages_per_visit']
-            # Lop off the floating point, turn into timedelta
-            user.time_on_site = timedelta(seconds=int(user.time_on_site))
+        )
+
         return users
 
 

tracking/migrations/0003_auto_20190722_1418.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracking', '0002_auto_20180918_2014'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pageview',
+            name='view_time',
+            field=models.DateTimeField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='visitor',
+            name='start_time',
+            field=models.DateTimeField(editable=False, default=django.utils.timezone.now, db_index=True),
+        ),
+    ]

tracking/models.py

@@ -38,7 +38,7 @@ class Visitor(models.Model):
     # Update to GenericIPAddress in Django 1.4
     ip_address = models.CharField(max_length=39, editable=False)
     user_agent = models.TextField(null=True, editable=False)
-    start_time = models.DateTimeField(default=timezone.now, editable=False)
+    start_time = models.DateTimeField(default=timezone.now, editable=False, db_index=True)
     expiry_age = models.IntegerField(null=True, editable=False)
     expiry_time = models.DateTimeField(null=True, editable=False)
     time_on_site = models.IntegerField(null=True, editable=False)
@@ -93,7 +93,7 @@ class Pageview(models.Model):
     referer = models.TextField(null=True, editable=False)
     query_string = models.TextField(null=True, editable=False)
     method = models.CharField(max_length=20, null=True)
-    view_time = models.DateTimeField()
+    view_time = models.DateTimeField(db_index=True)
 
     objects = PageviewManager()
 

tracking/settings.py

@@ -21,3 +21,5 @@
 TRACK_REFERER = getattr(settings, 'TRACK_REFERER', False)
 
 TRACK_QUERY_STRING = getattr(settings, 'TRACK_QUERY_STRING', False)
+
+TRACK_PAGING_SIZE = getattr(settings, 'TRACK_PAGING_SIZE', 100)

tracking/templates/tracking/dashboard.html

@@ -5,24 +5,10 @@
     </head>
     <body>
         <h1>Dashboard - django-tracking2</h1>
-        <div id="tracking-filters">
-            <form method="GET">
-                {{ form.as_table }}
-                <input type="submit" name="submit" value="submit" />
-            </form>
-        </div>
-        <div id="tracking-info">
-            <p>
-                Visitor tracking began on
-                {{ track_start_time|date:"Y-m-d H:i:s" }}
-            </p>
-            {% if warn_incomplete %}
-            <p class=warning>
-                The start time precedes the oldest tracked visitor, thus
-                the stats are not complete for the specified range.
-            </p>
-            {% endif %}
-        </div>
+        {% include "tracking/snippets/tracking_filters.html" %}
+        {% if has_pageviews %}
+            <a href={% url "tracking-page-overview" %}>Page centric statistics</a>
+        {% endif %}
         <div id="tracking-stats">
             {% include "tracking/snippets/stats.html" %}
         </div>

tracking/templates/tracking/page_detail.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>{{ page_url }} Details - django-tracking2</title>
+</head>
+<body>
+    <h1>{{ page_url }} Details - django-tracking2</h1>
+    {% include "tracking/snippets/tracking_filters.html" %}
+    <div id="tracking-stats">
+        <dl>
+            <dt>Total Views</dt>
+            <dd>{{ total_views }}</dt>
+            <dt># of Unique Visitors</dt>
+            <dd>{{ visitors }}</dt>
+        </dl>
+        {% if pageviews.has_previous %}
+            <a href="{% url 'tracking-page-detail' %}?page_url={{ page_url }}&page={{ pageviews.previous_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">previous</a>
+        {% endif %}
+        {% if pageviews.has_next %}
+            <a href="{% url 'tracking-page-detail' %}?page_url={{ page_url }}&page={{ pageviews.next_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">next</a>
+        {% endif %}
+        <table>
+            <caption>Pageviews</caption>
+            <thead>
+                <th>Time</th>
+                <th>User</th>
+                <th>Method</th>
+                <th>URL</th>
+            </thead>
+            <tbody>
+                {% for pv in pageviews %}
+                <tr>
+                    <td><a href="{% url 'tracking-visitor-page-detail' user_id=pv.visitor.user.pk %}?page_url={{ page_url }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="View visits by {% firstof pv.visitor.user.get_full_name pv.visitor.user %} involving {{ page_url }}">{{ pv.view_time|date:"Y-m-d H:i:s" }}</a></td>
+                    <td><a href="{% url 'tracking-visitor-page-detail' user_id=pv.visitor.user.pk %}?page_url={{ page_url }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="View visits by {% firstof pv.visitor.user.get_full_name pv.visitor.user %} involving {{ page_url }}">{% firstof pv.visitor.user.get_full_name pv.visitor.user %}</a></td>
+                    <td><a href="{% url 'tracking-visitor-page-detail' user_id=pv.visitor.user.pk %}?page_url={{ page_url }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="View visits by {% firstof pv.visitor.user.get_full_name pv.visitor.user %} involving {{ page_url }}">{{ pv.method }}</a></td>
+                    <td><a href="{% url 'tracking-visitor-page-detail' user_id=pv.visitor.user.pk %}?page_url={{ page_url }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="View visits by {% firstof pv.visitor.user.get_full_name pv.visitor.user %} involving {{ page_url }}">{{ page_url }}</a></td>
+                </tr>
+                {% endfor %}
+            </tbody>	    
+        </table>
+        {% if pageviews.has_previous %}
+            <a href="{% url 'tracking-page-detail' %}?page_url={{ page_url }}&page={{ pageviews.previous_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">previous</a>
+        {% endif %}
+        {% if pageviews.has_next %}
+            <a href="{% url 'tracking-page-detail' %}?page_url={{ page_url }}&page={{ pageviews.next_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">next</a>
+        {% endif %}
+    </div>
+</body>
+</html>

tracking/templates/tracking/page_overview.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Page Overview - django-tracking2</title>
+</head>
+<body>
+    <h1>Page Overview - django-tracking2</h1>
+    {% include "tracking/snippets/tracking_filters.html" %}
+    <div id="tracking-stats">
+        <dl>
+            <dt>Total Page Views</dt>
+            <dd>{{ total_page_views }}</dt>
+            <dt># of Pages Viewed</dt>
+            <dd>{{ total_pages }}</dt>
+        </dl>
+        {% if pageview_counts.has_previous %}
+            <a href="{% url 'tracking-page-overview' %}?page={{ pageview_counts.previous_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">previous</a>
+        {% endif %}
+        {% if pageview_counts.has_next %}
+            <a href="{% url 'tracking-page-overview' %}?page={{ pageview_counts.next_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">next</a>
+        {% endif %}
+        <table>
+            <caption>Pages</caption>
+            <thead>
+                <th>URL</th>
+                <th># of Views</th>
+            </thead>
+            <tbody>
+                {% for c in pageview_counts %}
+                <tr>
+                    <td><a href="{% url 'tracking-page-detail' %}?page_url={{ c.url }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="View all pageviews of {{ c.url }}">{{ c.url }}</a></td>
+                    <td><a href="{% url 'tracking-page-detail' %}?page_url={{ c.url }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="View all pageviews of {{ c.url }}">{{ c.views }}</a></td>
+                </tr>
+                {% endfor %}
+            </tbody>	    
+        </table>
+        {% if pageview_counts.has_previous %}
+            <a href="{% url 'tracking-page-overview' %}?page={{ pageview_counts.previous_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">previous</a>
+        {% endif %}
+        {% if pageview_counts.has_next %}
+            <a href="{% url 'tracking-page-overview' %}?page={{ pageview_counts.next_page_number }}&start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}">next</a>
+        {% endif %}
+    </div>
+</body>
+</html>

tracking/templates/tracking/snippets/stats.html

@@ -62,15 +62,17 @@ <h2>Registered Users</h2>
             <th># Visits</th>
             <th>Avg. Time on Site</th>
             <th>Avg. Pages/Visit</th>
+            <th>Last Pageview</th>
         </tr>
     </thead>
     <tbody>
         {% for user in user_stats %}
         <tr>
-            <th>{% firstof user.get_full_name user %}</th>
+            <th><a href="{% url 'tracking-visitor-overview' user_id=user.pk %}?start={{ start_time|date:"Y-m-d H:i:s" }}&end={{ end_time|date:"Y-m-d H:i:s" }}" title="Click to view visits by {% firstof user.get_full_name user %}">{% firstof user.get_full_name user %}</a></th>
             <td>{{ user.visit_count }}</td>
             <td>{{ user.time_on_site|default_if_none:"n/a" }}</td>
             <td>{{ user.pages_per_visit|floatformat|default:"n/a" }}</td>
+            <td>{{ user.last_pageview|default:"n/a" }}</td>
         </tr>
         {% endfor %}
     </tbody>

tracking/templates/tracking/snippets/tracking_filters.html

@@ -0,0 +1,21 @@
+<div id="tracking-filters">
+    <form method="GET">
+        {{ form.as_table }}
+        {% if page_url %}
+            <input name="page_url" type="hidden" value={{ page_url }} />
+        {% endif %}
+        <input type="submit" name="submit" value="submit" />
+    </form>
+</div>
+<div id="tracking-info">
+    <p>
+        Visitor tracking began on
+        {{ track_start_time|date:"Y-m-d H:i:s" }}
+    </p>
+    {% if warn_incomplete %}
+    <p class=warning>
+        The start time precedes the oldest tracked visitor, thus
+        the stats are not complete for the specified range.
+    </p>
+    {% endif %}
+</div>

tracking/templates/tracking/visitor_detail.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>{% firstof visit.user.get_full_name visit.user %} {{ visit.start_time|date:"Y-m-d H:i:s" }} - {{ visit.end_time|date:"Y-m-d H:i:s" }} Visit Detail - django-tracking2</title>
+</head>
+<body>
+    <h1>{% firstof visit.user.get_full_name visit.user %} {{ visit.start_time|date:"Y-m-d H:i:s" }} - {{ visit.end_time|date:"Y-m-d H:i:s" }} Visit Detail - django-tracking2</h1>
+    <div id="tracking-stats">
+        <dl>
+            <dt>Duration</dt>
+            <dd>{{ visit.time_on_site }}</dt>
+            <dt># of Page Views</dt>
+            <dd>{{ pvcount|default:"n/a" }}</dt>
+            <dt>Avg Time/Page</dt>
+            <dd>{{ avg_time_per_page|default_if_none:"n/a" }}</dt>
+            <dt>IP</dt>
+            <dd>{{ visit.ip_address }}</dt>
+            <dt>User Agent</dt>
+            <dd>{{ visit.user_agent }}</dt>
+        </dl>
+        {% if pvcount %}
+            <div id="tracking2-views-per-page">
+                {% if pageview_stats.has_previous %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.number }}&pvspage={{ pageview_stats.previous_page_number }}>previous</a>
+                {% endif %}
+                {% if pageview_stats.has_next %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.number }}&pvspage={{ pageview_stats.next_page_number }}>next</a>
+                {% endif %}
+                <table>
+                    <caption>Views/Page</caption>
+                    <thead>
+                        <th>URL</th>
+                        <th># of views</th>
+                    </thead>
+                    <tbody>
+                    {% for stat in pageview_stats %}
+                        <tr>
+                            <td><a href={% url 'tracking-visitor-page-detail' user_id=visit.user.pk %}?page_url={{ stat.url }} title="View visits by {% firstof visit.user.get_full_name visit.user %} involving {{ stat.url }}">{{ stat.url }}</a></td>
+                            <td>{{ stat.views }}</td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+                {% if pageview_stats.has_previous %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.number }}&pvspage={{ pageview_stats.previous_page_number }}>previous</a>
+                {% endif %}
+                {% if pageview_stats.has_next %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.number }}&pvspage={{ pageview_stats.next_page_number }}>next</a>
+                {% endif %}
+            </div>
+
+            <div id="tracking2-visitor-pageviews">
+                {% if pageviews.has_previous %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.previous_page_number }}&pvspage={{ pageview_stats.number }}>previous</a>
+                {% endif %}
+                {% if pageviews.has_next %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.next_page_number }}&pvspage={{ pageview_stats.number }}>next</a>
+                {% endif %}
+                <table>
+                    <caption>Page Views</caption>
+                    <thead>
+                        <th>Time</th>
+                        <th>Method</th>
+                        <th>URL</th>
+                    </thead>
+                    <tbody>
+                        {% for view in pageviews %}
+                        <tr>
+                            <td>{{ view.view_time|date:"Y-m-d H:i:s" }}</td>
+                            <td>{{ view.method }}</td>
+                            <td><a href={% url 'tracking-pageview-detail' user_id=visit.user.pk pageview_id=view.pk %} title="View pageview details">{{ view.url }}</a></td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>	    
+                </table>
+                {% if pageviews.has_previous %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.previous_page_number }}&pvspage={{ pageview_stats.number }}>previous</a>
+                {% endif %}
+                {% if pageviews.has_next %}
+                    <a href={% url 'tracking-visitor-detail' visit_id=visit.pk %}?pvpage={{ pageviews.next_page_number }}&pvspage={{ pageview_stats.number }}>next</a>
+                {% endif %}
+            </div>
+        {% endif %}
+    </div>
+</body>
+</html>