From 46992803e1bf91c7ef2c34c23ee0734e52f104d1 Mon Sep 17 00:00:00 2001
From: Bram van der Veen <96aa48@gmail.com>
Date: Tue, 16 Jun 2015 15:22:34 +0200
Subject: [PATCH] Fixed offset problem with teachers

---
 resources/jade/schedule.jade | 7 ++++---
 resources/less/style.less    | 5 +++++
 schedule.js                  | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/resources/jade/schedule.jade b/resources/jade/schedule.jade
index 17ecd41..5eaedae 100644
--- a/resources/jade/schedule.jade
+++ b/resources/jade/schedule.jade
@@ -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)]
diff --git a/resources/less/style.less b/resources/less/style.less
index bd07fbd..7d33755 100644
--- a/resources/less/style.less
+++ b/resources/less/style.less
@@ -73,6 +73,11 @@ div.schedule {
       span {
         display: inline-block;
         width: 33%;
+
+        &.sub_2 {
+           position: relative;
+           top: -15px;
+        }
       }
 
       .teacher {
diff --git a/schedule.js b/schedule.js
index 8f53581..86007fc 100644
--- a/schedule.js
+++ b/schedule.js
@@ -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;
       }