organicmaps/mmwatch
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed date grouping

Browse source
This commit is contained in:
Ilya Zverev 2016-05-31 17:23:09 +03:00
parent 367d5a2aae
commit 17ea879619
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
www/mmwatch.py
View file

@ -148,8 +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(Change.timestamp.day).order_by(-Change.id)
# TODO: debug timezones
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)
# Apply filters
for k in q:
@ -217,19 +216,6 @@ def the_one_and_only_page():
stats['pages'] = (stats['total'] + config.PAGE_SIZE - 1) / config.PAGE_SIZE
stats['users'] = q['users'].count(clear_limit=True)
# List of dates for filtering
dates = []
for row in q['dates']:
dates.append(row.timestamp.strftime('%d.%m.%Y'))
if False:
curdate = datetime.now()
earliest = Change.select(Change.timestamp).order_by(Change.id).limit(1).get().timestamp - timedelta(days=1)
for n in range(100 if nolimit else config.TOP):
if curdate < earliest:
break
dates.append(curdate.strftime('%d.%m.%Y'))
curdate -= timedelta(days=1)
return render_template('index.html', stats=stats, changes=q['changes'], users=q['users'], tags=q['tags'], versions=q['versions'], dates=q['dates'], params=params, purl=purl)
if __name__ == '__main__':