diff --git a/importer.py b/importer.py index 88bd07000bb0f5f5816ccb7a860fb22068f3fb3f..36866ce94dd8a69cd0a709c70abc2293dee9390f 100755 --- a/importer.py +++ b/importer.py @@ -80,9 +80,10 @@ def import_from(source=None, id=None): e['time'] = datetime.strptime("%s %s"%(k,j['start']) ,fmt) e['duration'] = int((datetime.strptime("%s %s"%(k,j['end']) ,fmt) - e['time']).seconds/60) e['place'] = query("SELECT name FROM places WHERE (campus_name = ?) OR ((NOT campus_name) AND name = ?)",j['place'],j['place'])[0]['name']; - e['exists'] = query("SELECT count(id) as c from lectures WHERE (time = ?) and (duration = ?) and (place = ?) and (course_id = ?)",e['time'],e['duration'],e['place'],id)[0]['c'] > 0 + e['title'] = i['type'] + e['exists'] = len(query("SELECT id from lectures WHERE (time = ?) and (duration = ?) and (place = ?) and (course_id = ?)",e['time'],e['duration'],e['place'],id)) > 0 events.append(e) - # it is pared. + # it is parsed. @@ -102,7 +103,7 @@ def import_from(source=None, id=None): for i in lectures: i['hascampusmapping'] = False - for j in uniqueevents: + for j in events: i['hascampusmapping'] = (i['place'] == j['place']) and (i['time'] == j['time']) and (i['duration'] == j['duration']) if i['hascampusmapping']: break diff --git a/server.py b/server.py index 8b6f522f92c0516c0982846a10b5edc08cf013e3..77d77d4ee6adfcf14d40867c4a2debcdda7b6da5 100755 --- a/server.py +++ b/server.py @@ -5,11 +5,8 @@ from datetime import date, timedelta, datetime, time, MINYEAR import threading import os import hashlib -import locale import random -locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8') - app = Flask(__name__) app.jinja_env.trim_blocks = True @@ -112,7 +109,7 @@ def human_semester(s, long=False): @app.template_filter(name='date') def human_date(d): - return d.strftime('%x') + return d.strftime('%d.%m.%Y') @app.template_filter() def rfc3339(d): diff --git a/templates/import_campus.html b/templates/import_campus.html index c37be8d8c3ad394e607f6ef90bb7069673e8522d..6471f47a230206085be718a66af55eade6851788 100644 --- a/templates/import_campus.html +++ b/templates/import_campus.html @@ -62,6 +62,9 @@ <ul class="list-group-item"> {% for i in events|sort(attribute='time') %} <li class="list-group-item row"> + <span class="col-xs-12"> + {{i|pprint}} + </span> <span class="col-xs-3"> Time: {{i.time}} </span>