diff --git a/server.py b/server.py
index f044766216585f5c3e46965f7a0c5513cfa9117f..cf8c297dd4c09326bd0ad2b6d7ba4e92628a1635 100755
--- a/server.py
+++ b/server.py
@@ -339,28 +339,107 @@ def log():
changelog = query('SELECT *, ( "table" || "." || id_value || "." ||field) as path FROM changelog LEFT JOIN users ON (changelog.who = users.id) ORDER BY "when" DESC LIMIT 50')
return render_template('log.html', changelog=changelog)
-@app.route('/import/<source>/<id>', methods=['GET', 'POST'])
-@app.route('/import/<source>/<int:numid>', methods=['GET', 'POST'])
-@handle_errors('course', 'Diese Veranstaltung existiert nicht!', 404, IndexError)
+@app.route('/import/<source>/<int:id>', methods=['GET', 'POST'])
@mod_required
-def import_from(numid=None, source=None, id=None):
+def import_from(source=None, id=None):
+
if source != "campus":
return "Unknown source", 404
+ courses = query('SELECT * FROM courses WHERE id = ?', id)[0]
+ lectures = query('SELECT * FROM lectures WHERE course_id = ?', courses['id'])
+
campus={}
for i in request.values:
- group, id, field = i.split('.', 2)
+ group, importid, field = i.split('.', 2)
if group == 'campus':
- if not id in campus:
- campus[id] = {}
- campus[id][field] = request.values[i]
-
- if numid:
- courses = query('SELECT * FROM courses WHERE id = ?', numid)[0]
- else:
- courses = query('SELECT * FROM courses WHERE handle = ?', id)[0]
- lectures = query('SELECT * FROM lectures WHERE course_id = ?', courses['id'])
- return render_template('import_campus.html', course=courses, lectures=lectures, campus=campus)
+ if not importid in campus:
+ campus[importid] = {}
+ campus[importid][field] = request.values[i]
+ for i in campus:
+ if i.startswith('new'):
+ if campus[i]['url'] != '':
+ query('INSERT INTO import_campus (url, type, course_id, last_checked, changed) VALUES (?, ?, ?, ?, 1)',campus[i]['url'],campus[i]['type'],id,datetime.now())
+ else:
+ if campus[i]['url'] != '':
+ query('UPDATE import_campus SET url = ?, `type` = ? WHERE (course_id = ?) AND (id = ?)', campus[i]['url'],campus[i]['type'],id,int(i))
+ else:
+ query('DELETE FROM import_campus WHERE (id = ?) AND (course_id = ?)',int(i),id)
+
+ import_campus = query('SELECT * FROM import_campus WHERE course_id = ?',id)
+ events = []
+ try:
+ from lxml import html
+ from lxml import etree
+ import urllib.request
+ # if u have to port this to anything new, god be with you.
+ for i in import_campus:
+ remote_html = urllib.request.urlopen(i['url']).read()
+ tablexpath = "//td[text()='Termine und Ort']/following::table[1]"
+ basetable = html.fromstring(remote_html).xpath(tablexpath)[0]
+ parsebase = html.tostring(basetable);
+
+ #parse recurring events
+ toparse = [i['url']]
+ for j in basetable.xpath("//table[@cellpadding='5']//tr[@class='hierarchy4' and td[@name='togglePeriodApp']]"):
+ url = str(j.xpath("td[@name='togglePeriodApp']/a/@href")[0])
+ toparse.append(url)
+ events_raw = []
+ for j in toparse:
+ if j.startswith('event'):
+ url = 'https://www.campus.rwth-aachen.de/rwth/all/'+j
+ else:
+ url = j
+ text = urllib.request.urlopen(url).read()
+ dom = html.fromstring(text).xpath(tablexpath)[0]
+ #we get the "heading" row, from it extract the room and time. best way to get it is to match on the picture -.-
+ baserow = dom.xpath("//table[@cellpadding='5']//tr[@class='hierarchy4' and td[@name='togglePeriodApp']/*/img[@src='../../server/img/minus.gif']]")
+ if not baserow:
+ continue
+ baserow = baserow[0]
+ rowdata = {'dates': []}
+ rowdata['place'] = baserow.xpath("td[6]/text()")[0][2:-1]
+ rowdata['start'] = baserow.xpath("td[3]/text()")[0]
+ rowdata['end'] = baserow.xpath("td[5]/text()")[0]
+ rowdata['dates'] = baserow.getparent().xpath("tr[@class='hierarchy5']//td[@colspan='3']/text()")
+ events_raw.append(rowdata)
+
+ # parse single appointments
+ singletable = basetable.xpath("//table[@cellpadding='3']/tr/td[text()='Einmalige Termine:']")[0].getparent().getparent()
+ for row in singletable.xpath("tr/td[2]"):
+ rowdata = {}
+ rowdata['place'] = row.xpath("text()[2]")[0][2:-1]
+ rowdata['dates'] = [row.xpath("text()[1]")[0][4:14]]
+ rowdata['start'] = row.xpath("text()[1]")[0][17:22]
+ rowdata['end'] = row.xpath("text()[1]")[0][27:32]
+ events_raw.append(rowdata)
+
+ #now we have to filter our data and do some lookups
+ for j in events_raw:
+ for k in j['dates']:
+ e = {}
+ fmt= "%d.%m.%Y %H:%M"
+ 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'] = 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.
+
+
+
+ except ImportError:
+ flash('python-lxml not found, campus import will not work.')
+
+ uniqevents = []
+ for i in events:
+ seen = False
+ for j in events:
+ seen = (i['place'] == j['place']) and (i['time'] == j['time']) and (i['duration'] == j['duration'])
+ if not seen:
+ uniqevents.append(i)
+
+ return render_template('import_campus.html', course=courses, lectures=lectures, import_campus=import_campus, events=uniqevents)
@app.route('/files/<filename>')
def files(filename):
diff --git a/templates/import_campus.html b/templates/import_campus.html
index b43f6820cbacf85dcd65fbf94088f367028e9bea..5a5b0366c2e2eb767e18ea367dd87cd7e40120eb 100644
--- a/templates/import_campus.html
+++ b/templates/import_campus.html
@@ -11,17 +11,37 @@
<p>Es folgen viele Pärchen an Campus-URL und Veranstaltungstyp Pärchen. Die Campus URL bekommt man aus dem Campus-System (<a href="https://www.campus.rwth-aachen.de/rwth/all/groups.asp">hier</a>). Der Veranstaltungstyp ist z.B. "Vorlesung" oder "Übung" oder "Praktikum".
</p>
<p>
- {{ campus }}
+ {{ import_campus|pprint }}
</p>
<form method="post">
- <ul class="list-group row">
- <li class="list-group-item form-inline">
- <span class="input-group">
- <input class="form-control" type="text" name="campus.0.url" placeholder="url">
+ <ul class="list-group row" style="margin-left: 0px; margin-right: 0px;">
+ {%for i in import_campus %}
+ <li class="list-group-item form-inline row">
+ <span class="input-group col-xs-8">
+ <input class="form-control" type="text" name="campus.{{i.id}}.url" value="{{i.url}}" id="campus-{{i.id}}-url" placeholder="url">
</span>
- <span class="input-group">
- <input class="form-control" type="test" name="campus.0.type" placeholder="type">
+ <span class="input-group col-xs-2">
+ <input class="form-control" type="test" name="campus.{{i.id}}.type" value="{{i.type}}" id="campus-{{i.id}}-type" placeholder="type">
</span>
+ <span class="input-group col-xs-1 pull-right">
+ <button class="btn btn-default pull-right" onclick="$('#campus-{{i.id}}-url').val('')">
+ <span class="glyphicon glyphicon-trash"></span>
+ </button>
+ </span>
+ </li>
+ {%endfor%}
+ <li class="list-group-item form-inline row">
+ <span class="input-group col-xs-8">
+ <input class="form-control" type="text" name="campus.new.url" placeholder="url">
+ </span>
+ <span class="input-group col-xs-2">
+ <input class="form-control" type="test" name="campus.new.type" placeholder="type">
+ </span>
+ <span class="input-group col-xs-1 pull-right">
+ <button class="btn btn-default pull-right">
+ <span class="glyphicon glyphicon-plus"></span>
+ </button>
+ </span>
</li>
</ul>
<button class="btn btn-default pull-right" type="submit">speichern und neu Laden</button>
@@ -35,5 +55,17 @@
</div>
</div>
</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h1 class="panel-title">Fehlende Termine:</h1>
+ </div>
+ <ul class="list-group-item">
+ {% for i in events if not i.exists %}
+ <li class="list-group-item">
+ {{i|pprint}}
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
{% endblock %}