Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoagwebsite/videoagwebsite

db_schema.sql

@@ -128,6 +128,7 @@ CREATE TABLE IF NOT EXISTS `log` (
 	`ip` varchar(64),
 	`id` varchar(64),
 	`time` datetime NOT NULL,
+	`source` varchar(8),
 	`object` varchar(10),
 	`obj_id` INTEGER,
 	`path` varchar(255) NOT NULL

server.py

@@ -323,7 +323,7 @@ def courses():
 		if course['semester'] == '':
 			course['semester'] = 'zeitlos'
 	groupedby = request.args.get('groupedby')
-	if groupedby not in ['title', 'semester', 'organizer']:
+	if groupedby not in ['title', 'semester', 'organizer', 'subject']:
 		groupedby = 'semester'
 	return render_template('courses.html', courses=courses, groupedby=groupedby)
 
@@ -552,7 +552,7 @@ def auth(): # For use with nginx auth_request
 		password = auth.password
 	if checkperm(perms, username=username, password=password):
 		try:
-			modify('INSERT INTO log VALUES (?, ?, ?, "video", ?, ?)', ip, cookie, datetime.now(), perms[0]['vid'], url)
+			modify('INSERT INTO log (ip, id, `time`, object, obj_id, path) VALUES (?, ?, ?, "video", ?, ?)', ip, cookie, datetime.now(), perms[0]['vid'], url)
 		except:
 			pass
 		r = make_response('OK', 200)

stats.py

@@ -29,7 +29,10 @@ def stats_generic(req, param=None):
 	rows = query(statsqueries[req], *(statsqueries[req].count('?')*[param]))
 	res = {'x':[], 'y':[]}
 	for row in rows:
+		if row['x'] != '':
 			res['x'].append(row['x'])
+		else:
+			res['x'].append('leer')
 		res['y'].append(row['y'])
 	return Response(json.dumps(res, default=plotly_date_handler),  mimetype='application/json')
 

templates/courses.html

@@ -19,8 +19,9 @@
 				</button>
 				<ul class="dropdown-menu dropdown-menu-right">
 					<li><a href="?groupedby=semester">Semester</a></li>
-					<li><a href="?groupedby=title">Veranstaltungen</a></li>
-					<li><a href="?groupedby=organizer">Dozenten</a></li>
+					<li><a href="?groupedby=title">Veranstaltung</a></li>
+					<li><a href="?groupedby=organizer">Dozent</a></li>
+					<li><a href="?groupedby=subject">Kategorie</a></li>
 				</ul>
 			</li>
 		</ul>