bram/rooster.io
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed offset problem with teachers

Browse source
This commit is contained in:
Bram van der Veen 2015-06-16 15:22:34 +02:00
parent 1ab02bc6ae
commit 46992803e1
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/jade/schedule.jade
View file

@ -13,9 +13,10 @@ div.schedule
each hour in day
if hour.teacher != 'vrij\r'
div.hour(class=hour.changed == 'true' ? 'changed' : '')
span.teacher= hour.teacher
span.chamber= hour.chamber
span.course= hour.course
each subhour in hour.teacher
span.teacher(class='sub_' + hour.teacher.length)= hour.teacher[hour.teacher.indexOf(subhour)]
span.chamber(class='sub_' + hour.teacher.length)= hour.chamber[hour.teacher.indexOf(subhour)]
span.course(class='sub_' + hour.teacher.length)= hour.course[hour.teacher.indexOf(subhour)]
if match.json.indexOf(day) == 0
span.time= times[match.json[0].indexOf(hour)]

5
resources/less/style.less
View file

@ -73,6 +73,11 @@ div.schedule {
span {
display: inline-block;
width: 33%;
&.sub_2 {
position: relative;
top: -15px;
}
}
.teacher {

7
schedule.js
View file

@ -29,18 +29,21 @@ function get(url, callback) {
//Function for converting the page into a json dataset.
function to_json(page) {
var result = cheerio('td:nth-child(3) table', page);
var is_teacher = cheerio(cheerio(page).find('tr.CoreDark').find('td')[3]).find('a').html() == null;
var amount_of_days = cheerio(result).find('tr.AccentDark').find('td').length - 1;
var amount_of_hours = config().amount_of_hours;
var schedule_data = [];
var offset = is_teacher ? 5 : 6;
//Looping for amount of days
for (day = 0; day < amount_of_days; day++) {
schedule_data[day] = [];
//Looping for amount of hours
for (hour = 0; hour < amount_of_hours; hour++) {
var schedule = cheerio('tr:nth-child('+ (6 + hour) +')', result);
var schedule = cheerio('tr:nth-child('+ (offset + hour) +')', result);
//Looping for (optional) specialhours
var amount_of_special_hours = schedule.find('table').eq(day).children().length;
@ -50,7 +53,7 @@ function to_json(page) {
//Give the value of the schedule hour to the fitting array.
schedule_data[day][hour].teacher[special_hour] = selected_hour.eq(0).html();
schedule_data[day][hour].chamber[special_hour] = selected_hour.eq(2).html();
schedule_data[day][hour].course[special_hour] = selected_hour.eq(4).html( );
schedule_data[day][hour].course[special_hour] = selected_hour.eq(4).html();
//Check if the hour is 'changed' by the schedule authors, if so set to true.
schedule_data[day][hour].changed[special_hour] = selected_hour.eq(0).attr().class == 'tableCellNew' ? true : false;
}