Show number of users for each day

This commit is contained in:
Ilya Zverev 2016-06-01 12:31:41 +03:00
parent 17ea879619
commit c7f90781cd
2 changed files with 2 additions and 2 deletions

View file

@ -148,7 +148,7 @@ def the_one_and_only_page():
q['tags'] = Change.select(Change.main_tag, peewee.fn.Count(Change.id).alias('count')).group_by(Change.main_tag).order_by(peewee.fn.Count(Change.id).desc())
q['versions'] = Change.select(Change.version, peewee.fn.Count(Change.id).alias('count')).group_by(Change.version).order_by(peewee.fn.Count(Change.id).desc())
q['stat_src'] = Change.select(Change.action, Change.obj_type, peewee.fn.Count(Change.id).alias('count')).group_by(Change.action, Change.obj_type).order_by(peewee.fn.Count(Change.id).desc())
q['dates'] = Change.select(Change.timestamp, peewee.fn.Count(Change.id).alias('count')).group_by(database.truncate_date('day', Change.timestamp)).order_by(-Change.id)
q['dates'] = Change.select(Change.timestamp, peewee.fn.Count(Change.id).alias('count'), peewee.fn.Count(peewee.fn.Distinct(Change.user)).alias('users')).group_by(database.truncate_date('day', Change.timestamp)).order_by(-Change.id)
# Apply filters
for k in q:

View file

@ -84,7 +84,7 @@
<li>{{ params.date }} <a href="{{ purl(params, date=None) }}">X</a></li>
{% else %}
{% for d in dates %}
<li><a href="{{ purl(params, date=d.timestamp.strftime('%d.%m.%Y')) }}">{{ d.timestamp.strftime('%d.%m.%Y') }}</a> ({{ d.count }})</li>
<li><a href="{{ purl(params, date=d.timestamp.strftime('%d.%m.%Y')) }}">{{ d.timestamp.strftime('%d.%m.%Y') }}</a> ({{ d.count }} by {{ d.users }})</li>
{% endfor %}
{% endif %}
</ul>