diff --git a/resources/jade/schedule.jade b/resources/jade/schedule.jade index b628d56..d76267b 100644 --- a/resources/jade/schedule.jade +++ b/resources/jade/schedule.jade @@ -1 +1,10 @@ include header + +div.schedule + each day in json + div.day + each hour in day + div.hour + span.teacher= hour.teacher + span.chamber= hour.chamber + span.course= hour.course diff --git a/resources/less/style.less b/resources/less/style.less index 8619279..5452822 100644 --- a/resources/less/style.less +++ b/resources/less/style.less @@ -44,3 +44,16 @@ background-color: #96aa48; margin-bottom: 50px; } + +div.schedule { + display: table; + + div.day { + float: left; + + div.hour { + height: 20px; + } + } + +} diff --git a/schedule.js b/schedule.js index 795a156..2d85911 100644 --- a/schedule.js +++ b/schedule.js @@ -45,7 +45,7 @@ function to_json(page) { var amount_of_special_hours = schedule.find('table').eq(0).children().length; for (special_hour = 0; special_hour < amount_of_special_hours; special_hour++) { schedule_data[day][hour] = {teacher: [], chamber: [], course: [], changed: []}; - var selected_hour = schedule.find('table').eq(0).find('tr').eq(special_hour).find('td'); + var selected_hour = schedule.find('table').eq(day).find('tr').eq(special_hour).find('td'); schedule_data[day][hour].teacher[special_hour] = selected_hour.eq(0).html(); schedule_data[day][hour].chamber[special_hour] = selected_hour.eq(2).html(); diff --git a/web.js b/web.js index 3fa9a09..3eac88a 100644 --- a/web.js +++ b/web.js @@ -33,6 +33,7 @@ app.param('search', schedule); app.param('search', function (req, res) { res.render('schedule', req.match); + console.log(req.match.json[0][0]); }); app.listen(1024);