From bc5e43970dfb4b547a134e643d8645382940d744 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Mon, 23 Oct 2017 01:00:04 +0200
Subject: [PATCH] Revert "fixed import errors for stats"
This reverts commit 9231e1cbd86ddbec9bbe6ebb66ded25cb270bc6d.
---
stats.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/stats.py b/stats.py
index 799e5bc..6023782 100644
--- a/stats.py
+++ b/stats.py
@@ -2,7 +2,7 @@ from server import *
import json
from jobs import date_json_handler
from hashlib import md5
-import datetime
+from datetime import datetime
@app.route('/internal/stats')
@app.route('/internal/stats/<semester>')
@@ -13,11 +13,11 @@ def stats():
for s in semester:
year = int(s['semester'][0:4])
if s['semester'].endswith('ss'):
- s['from'] = datetime.datetime(year,4,1)
- s['to'] = datetime.datetime(year,10,1)
+ s['from'] = datetime(year,4,1)
+ s['to'] = datetime(year,10,1)
if s['semester'].endswith('ws'):
- s['from'] = datetime.datetime(year,10,1)
- s['to'] = datetime.datetime(year+1,4,1)
+ s['from'] = datetime(year,10,1)
+ s['to'] = datetime(year+1,4,1)
return render_template('stats.html',semester=semester,filter=request.args.get('filter'))
statsqueries = {}
@@ -117,7 +117,7 @@ def stats_viewsperday(req, param=""):
expr = queries[req].replace('%T', '"'+query(date_subexpr%('viewsperday.'+req), param)[0]['t']+'"')
params = [param]*expr.count('?')
try:
- modify(update_expr%('viewsperday.'+req, expr), param, *(params+[datetime.datetime.combine(datetime.date.today(), datetime.time())]))
+ modify(update_expr%('viewsperday.'+req, expr), param, *(params+[datetime.combine(date.today(), time())]))
modify('COMMIT')
except Exception:
traceback.print_exc()
--
GitLab