Skip to content
Snippets Groups Projects
Commit 25cd2a31 authored by Julian Rother's avatar Julian Rother
Browse files

Extended statistics to 'generic' ones

parent 820a0c92
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
stats.py
+ 21
− 12
View file @ 25cd2a31
...@@ -8,20 +8,30 @@ from jobs import date_json_handler ...@@ -8,20 +8,30 @@ from jobs import date_json_handler
def stats(): def stats():
return render_template('stats.html') return render_template('stats.html')
statsqueries = {} statsqueries = {}
statsqueries['course_count'] = "SELECT count(id) as count, semester FROM courses GROUP BY semester;" statsqueries['formats_views'] = "SELECT formats.description AS x, count(log.id) AS y FROM log JOIN videos ON (videos.id = log.obj_id) JOIN formats ON (formats.id = videos.video_format) GROUP BY formats.id"
statsqueries['lectures_count'] = "SELECT count(lectures.id) as count, semester FROM lectures JOIN courses on courses.id=lectures.course_id GROUP BY semester;" statsqueries['course_count'] = "SELECT semester AS x, count(id) AS y FROM courses GROUP BY semester"
statsqueries['lectures_count'] = "SELECT semester AS x, count(lectures.id) AS y FROM lectures JOIN courses ON (courses.id = lectures.course_id) GROUP BY semester"
statsqueries['categories_courses'] = "SELECT courses.subject AS x, count(courses.id) AS y FROM courses GROUP BY courses.subject ORDER BY y DESC LIMIT 100"
statsqueries['organizer_courses'] = "SELECT courses.organizer AS x, count(courses.id) AS y FROM courses GROUP BY courses.organizer ORDER BY y DESC LIMIT 100"
statsqueries['categories_lectures'] = "SELECT courses.subject AS x, count(lectures.id) AS y FROM lectures JOIN courses ON (courses.id = lectures.course_id) GROUP BY courses.subject ORDER BY y DESC LIMIT 100"
statsqueries['lecture_views'] = "SELECT lectures.time AS x, count(log.id) AS y FROM log JOIN videos ON (videos.id = log.obj_id) JOIN lectures ON (lectures.id = videos.lecture_id) WHERE (lectures.course_id = ?) GROUP BY lectures.id ORDER BY lectures.time"
def plotly_date_handler(obj):
return obj.strftime("%Y-%m-%d %H:%M:%S")
@app.route('/stats/data/<dataname>') @app.route('/stats/generic/<req>')
@app.route('/stats/data/<dataname>/<parameter>') @app.route('/stats/generic/<req>/<param>')
@mod_required @mod_required
def stats_data(dataname, parameter=None): def stats_generic(req, param=None):
if parameter: if req not in statsqueries:
data = query(statsqueries[dataname],parameter) return 404, 'Not found'
else: rows = query(statsqueries[req], *(statsqueries[req].count('?')*[param]))
data = query(statsqueries[dataname]) res = {'x':[], 'y':[]}
return Response(json.dumps(data, default=date_json_handler), mimetype='application/json') for row in rows:
res['x'].append(row['x'])
res['y'].append(row['y'])
return Response(json.dumps(res, default=plotly_date_handler), mimetype='application/json')
@app.route('/stats/viewsperday') @app.route('/stats/viewsperday')
def stats_viewsperday(): def stats_viewsperday():
...@@ -30,7 +40,6 @@ def stats_viewsperday(): ...@@ -30,7 +40,6 @@ def stats_viewsperday():
courseid = request.args.get('course', None) courseid = request.args.get('course', None)
lectureid = request.args.get('lecture', None) lectureid = request.args.get('lecture', None)
videoid = request.args.get('video', None) videoid = request.args.get('video', None)
print(start, end, courseid, lectureid, videoid)
rows = query('''SELECT log.id AS id, log.time AS time, formats.description AS fmt rows = query('''SELECT log.id AS id, log.time AS time, formats.description AS fmt
FROM log FROM log
JOIN videos ON (videos.id = log.obj_id) JOIN videos ON (videos.id = log.obj_id)
......
templates/course.html
+ 4
− 2
View file @ 25cd2a31
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
{% from 'macros.html' import moderator_checkbox %} {% from 'macros.html' import moderator_checkbox %}
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% from 'macros.html' import moderator_permissioneditor %} {% from 'macros.html' import moderator_permissioneditor %}
{% from 'macros.html' import stats_viewsperday %} {% from 'macros.html' import stats_viewsperday, stats_generic %}
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}- {{course.title}}{% endblock %} {% block title %}- {{course.title}}{% endblock %}
...@@ -47,8 +47,10 @@ ...@@ -47,8 +47,10 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div id="statview" class="col-xs-11" style="height:600px"></div> <div id="statview" class="col-xs-6" style="height:600px"></div>
{{stats_viewsperday("statview", "Abrufe pro Tag", course=course.id)}} {{stats_viewsperday("statview", "Abrufe pro Tag", course=course.id)}}
<div id="lecture_views" class="col-xs-6" style="height:600px"></div>
{{stats_generic("lecture_views", "lecture_views", "Abrufe pro Aufnahme", param=course.id, type="bar")}}
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
templates/macros.html
+ 40
− 5
View file @ 25cd2a31
...@@ -255,12 +255,11 @@ $('#embedcodebtn').popover( ...@@ -255,12 +255,11 @@ $('#embedcodebtn').popover(
error: moderator.api.handleapierror, error: moderator.api.handleapierror,
success: function (data) { success: function (data) {
var traces = []; var traces = [];
var i = 0; for (var i = 1; i < data.views.length; i++) {
if (data.views.length == 2) traces.push({"x": data.times, "y": data.views[i].vals, "type": "{{type}}", "name": data.views[i].name, line: {"width": 1}});
i = 1;
for (; i < data.views.length; i++) {
traces.push({"x": data.times, "y": data.views[i].vals, "type": "{{type}}", "name": data.views[i].name});
} }
if (data.views.length > 2)
traces.push({"x": data.times, "y": data.views[0].vals, "type": "{{type}}", "name": "gesamt", line: {"color": "black", "width": 2}});
var layout = { var layout = {
"title": "{{title}}", "title": "{{title}}",
"showlegend": (traces.length != 1) "showlegend": (traces.length != 1)
...@@ -270,3 +269,39 @@ $('#embedcodebtn').popover( ...@@ -270,3 +269,39 @@ $('#embedcodebtn').popover(
}); });
</script> </script>
{% endmacro %} {% endmacro %}
{% macro stats_generic(id, req, title, param=None, type="scatter") %}
<script>
$.ajax({
method: "GET",
url: "{{url_for('stats_generic', req=req, param=param)}}",
dataType: "json",
error: moderator.api.handleapierror,
success: function (data) {
var layout = {
"title": "{{title}}",
"showlegend": false
};
Plotly.newPlot("{{id}}", [{"x": data.x, "y": data.y, "type": "{{type}}"}], layout, { "modeBarButtonsToRemove": ['sendDataToCloud','hoverCompareCartesian'], "displaylogo": false});
}
});
</script>
{% endmacro %}
{% macro stats_pie(id, req, title, showlegend=True, param=None) %}
<script>
$.ajax({
method: "GET",
url: "{{url_for('stats_generic', req=req, param=param)}}",
dataType: "json",
error: moderator.api.handleapierror,
success: function (data) {
var layout = {
"title": "{{title}}",
"showlegend": {% if showledgend %}true{% else %}false{% endif %}
};
Plotly.newPlot("{{id}}", [{"labels": data.x, "values": data.y, "type": "pie"}], layout, { "modeBarButtonsToRemove": ['sendDataToCloud','hoverCompareCartesian'], "displaylogo": false});
}
});
</script>
{% endmacro %}
templates/stats.html
+ 13
− 47
View file @ 25cd2a31
{% from 'macros.html' import stats_viewsperday %} {% from 'macros.html' import stats_viewsperday, stats_generic, stats_pie %}
{% extends "base.html" %} {% extends "base.html" %}
{% block header %} {% block header %}
...@@ -14,52 +14,18 @@ ...@@ -14,52 +14,18 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row col-xs-12"> <div class="row col-xs-12">
<div id="coursespersemester" style="height:600px;" class="col-xs-6" ></div> <div id="course_count" class="col-xs-6" style="height:600px"></div>
<script> {{stats_generic("course_count", "course_count", "Veranstaltungen pro Jahr")}}
$.ajax({ <div id="lectures_count" class="col-xs-6" style="height:600px"></div>
method: "GET", {{stats_generic("lectures_count", "lectures_count", "Aufnahmen pro Jahr")}}
url: "/stats/data/course_count", <div id="formats_views" class="col-xs-6" style="height:600px"></div>
dataType: "json", {{stats_pie("formats_views", "formats_views", "Formatnutzung")}}
error: moderator.api.handleapierror, <div id="organizer_courses" class="col-xs-6" style="height:600px"></div>
success: function (data) { {{stats_pie("organizer_courses", "organizer_courses", "Veranstaltungne nach Dozent", showlegend=False)}}
var trace = {"y": [], "x": [], "type": "scatter"}; <div id="categories_courses" class="col-xs-6" style="height:600px"></div>
for (var i=0; i < data.length; i++) { {{stats_pie("categories_courses", "categories_courses", "Veranstaltungen nach Kategorie", showlegend=False)}}
if (data[i].semester != "") { <div id="categories_lectures" class="col-xs-6" style="height:600px"></div>
trace.x.push(data[i].semester) {{stats_pie("categories_lectures", "categories_lectures", "Aufnahmen nach Kategorie", showlegend=False)}}
trace.y.push(data[i].count)
}
}
var layout = {
"title": 'Veranstaltungen pro Semester',
"showlegend": false
};
Plotly.newPlot('coursespersemester', [trace], layout, { "modeBarButtonsToRemove": ['sendDataToCloud','hoverCompareCartesian'], "displaylogo": false});
}
});
</script>
<div id="lecturespersemester" style="height:600px" class="col-xs-6"></div>
<script>
$.ajax({
method: "GET",
url: "/stats/data/lectures_count",
dataType: "json",
error: moderator.api.handleapierror,
success: function (data) {
var trace = {"y": [], "x": [], "type": "scatter"};
for (var i=0; i < data.length; i++) {
if (data[i].semester != "") {
trace.x.push(data[i].semester)
trace.y.push(data[i].count)
}
}
var layout = {
"title": 'Aufnahmen pro Semester',
"showlegend": false
};
Plotly.newPlot('lecturespersemester', [trace], layout, { "modeBarButtonsToRemove": ['sendDataToCloud','hoverCompareCartesian'], "displaylogo": false});
}
});
</script>
<div id="statview" class="col-xs-12" style="height:600px"></div> <div id="statview" class="col-xs-12" style="height:600px"></div>
{{stats_viewsperday("statview", "Abrufe pro Tag")}} {{stats_viewsperday("statview", "Abrufe pro Tag")}}
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment