progress on schedule conflicts

This commit is contained in:
Sriram Hariharan
2018-07-10 14:50:44 -05:00
parent 0014f7aed7
commit f89318feba
3 changed files with 22 additions and 5 deletions

View File

@@ -11,6 +11,8 @@ var course_nbr;
var times = []; var times = [];
var dates = []; var dates = [];
var locations = []; var locations = [];
var datetimearr = [];
var description; var description;
var status; var status;
const days = new Map([["M" ,"Monday"], const days = new Map([["M" ,"Monday"],
@@ -101,6 +103,11 @@ function getCourseInfo(row){
profname = profname.substring(1); profname = profname.substring(1);
} }
var numlines = $(this).find('td[data-th="Days"]>span').length; var numlines = $(this).find('td[data-th="Days"]>span').length;
dates = [];
times = [];
locations = [];
datetimearr = [];
var arr = [];
for(var i=0; i<numlines;i++){ for(var i=0; i<numlines;i++){
var date = $(this).find('td[data-th="Days"]>span:eq('+i+')').text(); var date = $(this).find('td[data-th="Days"]>span:eq('+i+')').text();
var time = $(this).find('td[data-th="Hour"]>span:eq('+i+')').text(); var time = $(this).find('td[data-th="Hour"]>span:eq('+i+')').text();
@@ -111,6 +118,7 @@ function getCourseInfo(row){
$(".topbuttons").before('<h2 class="dateTimePlace">'+makeLine(date,time,place)+'</th>'); $(".topbuttons").before('<h2 class="dateTimePlace">'+makeLine(date,time,place)+'</th>');
// makeLine(date,time,place); // makeLine(date,time,place);
} }
console.log(datetimearr);
return false; return false;
} }
}); });
@@ -127,21 +135,21 @@ function getCourseInfo(row){
course_nbr = coursename.substring(coursename.search(/\d/),coursename.indexOf(" ",coursename.search(/\d/))); course_nbr = coursename.substring(coursename.search(/\d/),coursename.indexOf(" ",coursename.search(/\d/)));
} }
//MWF //THIS CODE IS EXTREMELY MESSY, CLEAN UP GACK
//TTH
//MTHF
function makeLine(date, time, place){ function makeLine(date, time, place){
var arr = new Array(); var arr = [];
var output = ""; var output = "";
for(var i = 0; i<date.length;i++){ for(var i = 0; i<date.length;i++){
var letter = date.charAt(i); var letter = date.charAt(i);
var day = ""; var day = "";
if(letter == "T" && i <date.length-1 && date.charAt(i+1) == "H"){ if(letter == "T" && i <date.length-1 && date.charAt(i+1) == "H"){
arr.push(days.get("TH")); arr.push(days.get("TH"));
datetimearr.push(["TH", convertTime(time)]);
} }
else { else {
if(letter != "H"){ if(letter != "H"){
arr.push(days.get(letter)); arr.push(days.get(letter));
datetimearr.push([letter, convertTime(time)]);
} }
} }
} }
@@ -167,6 +175,14 @@ function makeLine(date, time, place){
var building = place.substring(0,place.search(/\d/)-1); var building = place.substring(0,place.search(/\d/)-1);
return output + " at "+time.replace(/\./g,'').replace(/\-/g,' to ')+" in "+"<a style='font-size:medium' target='_blank' href='"+"https://maps.utexas.edu/buildings/UTM/"+building+"''>"+place.substring(0,place.search(/\d/)-1)+"</>"; return output + " at "+time.replace(/\./g,'').replace(/\-/g,' to ')+" in "+"<a style='font-size:medium' target='_blank' href='"+"https://maps.utexas.edu/buildings/UTM/"+building+"''>"+place.substring(0,place.search(/\d/)-1)+"</>";
} }
function convertTime(time){
var converted = time.replace(/\./g,'').split("-");
for(var i = 0; i<2;i++){
converted[i] = moment(converted[i], ["h:mm A"]).format("HH:mm");
}
return converted;
}
function getDistribution(){ function getDistribution(){
var query = "select * from agg"; var query = "select * from agg";
query += " where dept like '%"+department+"%'"; query += " where dept like '%"+department+"%'";

View File

@@ -13,7 +13,7 @@
], ],
"content_scripts": [{ "content_scripts": [{
"css": ["styles.css"], "css": ["styles.css"],
"js": ["sql-memory-growth.js","highcharts.js","jquery-3.3.1.min.js","content.js"], "js": ["moment.min.js","sql-memory-growth.js","highcharts.js","jquery-3.3.1.min.js","content.js"],
"matches": ["https://utdirect.utexas.edu/apps/registrar/course_schedule/*"] "matches": ["https://utdirect.utexas.edu/apps/registrar/course_schedule/*"]
}], }],
"web_accessible_resources": [ "web_accessible_resources": [

1
moment.min.js vendored Normal file

File diff suppressed because one or more lines are too long