Skip to content
Snippets Groups Projects
Unverified Commit 8f7ccbad authored by Andreas Valder's avatar Andreas Valder
Browse files

fix some linter errors

parent 8511deb1
Branches
No related tags found
No related merge requests found
...@@ -7,15 +7,21 @@ from datetime import time ...@@ -7,15 +7,21 @@ from datetime import time
@app.route('/internal/user/<int:user>/cutprogress', endpoint='cutprogress_user') @app.route('/internal/user/<int:user>/cutprogress', endpoint='cutprogress_user')
@mod_required @mod_required
def cutprogress(user=None): def cutprogress(user=None):
allsemester = query('SELECT DISTINCT semester from courses ORDER BY semester DESC'); allsemester = query('SELECT DISTINCT semester from courses ORDER BY semester DESC')
semester = request.values.get('semester', allsemester[0]['semester']) semester = request.values.get('semester', allsemester[0]['semester'])
coursesraw = query('SELECT courses.id, courses.handle, courses.short FROM courses WHERE semester = ?', semester) coursesraw = query('SELECT courses.id, courses.handle, courses.short FROM courses WHERE semester = ?', semester)
courses = [] courses = []
maxlecturecount = 0 maxlecturecount = 0
for course in coursesraw: for course in coursesraw:
course['lectures'] = query('SELECT lectures.title, lectures.time, lectures.id FROM lectures WHERE lectures.course_id= ? AND NOT lectures.deleted AND NOT lectures.norecording ORDER BY lectures.time', course['id']) course['lectures'] = query('''
SELECT lectures.title, lectures.time, lectures.id FROM lectures
WHERE lectures.course_id= ? AND NOT lectures.deleted AND NOT lectures.norecording
ORDER BY lectures.time''', course['id'])
for lecture in course['lectures']: for lecture in course['lectures']:
lecture['videos'] = query('SELECT videos.path, formats.description as formatdesc, videos.visible FROM videos JOIN formats ON (videos.video_format = formats.id) WHERE videos.lecture_id = ? AND NOT videos.deleted', lecture['id']) lecture['videos'] = query('''
SELECT videos.path, formats.description as formatdesc, videos.visible FROM videos
JOIN formats ON (videos.video_format = formats.id)
WHERE videos.lecture_id = ? AND NOT videos.deleted''', lecture['id'])
course['responsible'] = query('''SELECT users.* course['responsible'] = query('''SELECT users.*
FROM responsible FROM responsible
JOIN users ON (responsible.user_id = users.id AND responsible.course_id = ?) JOIN users ON (responsible.user_id = users.id AND responsible.course_id = ?)
...@@ -25,4 +31,9 @@ def cutprogress(user=None): ...@@ -25,4 +31,9 @@ def cutprogress(user=None):
if not user or user in [ r['id'] for r in course['responsible'] ]: if not user or user in [ r['id'] for r in course['responsible'] ]:
courses.append(course) courses.append(course)
maxlecturecount = max(len(course['lectures']), maxlecturecount) maxlecturecount = max(len(course['lectures']), maxlecturecount)
return render_template('cutprogress.html', allsemester=allsemester, semester=semester, courses=courses, maxlecturecount=maxlecturecount, user=query('SELECT * FROM users WHERE id = ?', user)[0] if user else None) return render_template('cutprogress.html',
allsemester=allsemester,
semester=semester,
courses=courses,
maxlecturecount=maxlecturecount,
user=query('SELECT * FROM users WHERE id = ?', user)[0] if user else None)
...@@ -51,7 +51,13 @@ elif config['DB_ENGINE'] == 'mysql': ...@@ -51,7 +51,13 @@ elif config['DB_ENGINE'] == 'mysql':
def get_dbcursor(): def get_dbcursor():
if 'db' not in g or not g.db.is_connected(): if 'db' not in g or not g.db.is_connected():
g.db = mysql.connector.connect(user=config['MYSQL_USER'], password=config['MYSQL_PASSWD'], host=config.get('MYSQL_HOST', None), port=config.get('MYSQL_PORT', 3306), unix_socket=config.get('MYSQL_UNIX', None), database=config['MYSQL_DB']) g.db = mysql.connector.connect(
user=config['MYSQL_USER'],
password=config['MYSQL_PASSWD'],
host=config.get('MYSQL_HOST', None),
port=config.get('MYSQL_PORT', 3306),
unix_socket=config.get('MYSQL_UNIX', None),
database=config['MYSQL_DB'])
if not hasattr(request, 'db'): if not hasattr(request, 'db'):
request.db = g.db.cursor() request.db = g.db.cursor()
return request.db return request.db
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment