DerexXD/UT-Registration-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saving courses now works

Browse Source
This commit is contained in:
Sriram Hariharan
2018-07-09 19:10:57 -05:00
parent 659848d65f
commit 433f64d1c5
2 changed files with 195 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
background.js
View File

@@ -1,6 +1,14 @@
chrome.runtime.onMessage.addListener(function(request, sender, response) { chrome.runtime.onMessage.addListener(function(request, sender, response) {
if(request.greeting == "hello") { if(request.command == "courseStorage") {
getSaved(request,sender,response); if(request.action == "add"){
add(request,sender,response);
}
if(request.action == "remove"){
remove(request,sender,response);
}
}
else if(request.command == "alreadyContains"){
alreadyContains(request.course,response);
} }
else{ else{
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
@@ -16,10 +24,51 @@ chrome.runtime.onMessage.addListener(function(request, sender, response) {
return true; return true;
}); });
chrome.runtime.onInstalled.addListener(function() {
var arr = new Array();
chrome.storage.sync.set({savedCourses: arr}, function() {
console.log('initial course list');
});
});
function getSaved(request, sender, sendResponse) { function add(request, sender, sendResponse) {
console.log(sender.tab ? var courses;
"from a content script:" + sender.tab.url : var response;
"from the extension"); chrome.storage.sync.get('savedCourses', function(data) {
sendResponse({farewell: "goodbye"}); courses = data.savedCourses;
courses.push(request.course)
console.log(courses);
chrome.storage.sync.set({savedCourses: courses});
sendResponse({done:"Added: "+request.course.unique+request.course.coursename,label:"Remove Course -"});
});
}
function remove(request, sender, sendResponse) {
var courses;
var response;
chrome.storage.sync.get('savedCourses', function(data) {
courses = data.savedCourses;
var index = 0;
while(index<courses.length && courses[index].unique != request.course.unique){
index++;
}
courses.splice(index,1);
console.log(courses);
chrome.storage.sync.set({savedCourses: courses});
sendResponse({done:"removed: "+request.course.unique+request.course.coursename,label:"Add Course +"});
});
}
function alreadyContains(course,sendResponse){
chrome.storage.sync.get('savedCourses', function(data) {
courses = data.savedCourses;
var contains = false;
var i = 0;
while(i < courses.length && !contains){
if(courses[i].unique == course.unique){
contains = true;
}
i++;
}
sendResponse({alreadyContains: contains});
});
} }

248
content.js
View File

@@ -8,6 +8,9 @@ var uniquenum;
var profurl; var profurl;
var department; var department;
var course_nbr; var course_nbr;
var times = [];
var dates = [];
var locations = [];
var description; var description;
var status; var status;
const days = new Map([["M" ,"Monday"], const days = new Map([["M" ,"Monday"],
@@ -39,18 +42,23 @@ $(document).ready( function() {
} }
$(this).append('<td data-th="Plus"><input type="image" class="distButton" style="vertical-align: bottom; display:block;" width="25" height="25" src='+chrome.extension.getURL('disticon.png')+' /></td>'); $(this).append('<td data-th="Plus"><input type="image" class="distButton" style="vertical-align: bottom; display:block;" width="25" height="25" src='+chrome.extension.getURL('disticon.png')+' /></td>');
} }
}); });
$(".distButton").click(function(){ $(".distButton").click(function(){
var row = $(this).closest('tr'); var row = $(this).closest('tr');
getCourseInfo(row); getCourseInfo(row);
getDistribution(); getDistribution();
}); });
$("#saveCourse").click(function(){
chrome.runtime.sendMessage({greeting: "hello"}, function(response) {
console.log(response.farewell);
});
$("#saveCourse").click(function(){
var c = new Course(coursename,uniquenum, profname, times, dates, locations, status, profurl);
chrome.runtime.sendMessage({command: "courseStorage",course: c, action:$("#saveCourse").text().substring(0,$("#saveCourse").text().indexOf(" ")).toLowerCase()}, function(response) {
$("#saveCourse").text(response.label);
alert(response.done);
});
$("#saveCourse").text("Remove Course");
}); });
$("#Syllabi").click(function(){ $("#Syllabi").click(function(){
setTimeout(function(){ setTimeout(function(){
window.open('https://utdirect.utexas.edu/apps/student/coursedocs/nlogon/?semester=&department='+department+'&course_number='+course_nbr+'&course_title=&unique=&instructor_first=&instructor_last='+profname+'&course_type=In+Residence&search=Search'); window.open('https://utdirect.utexas.edu/apps/student/coursedocs/nlogon/?semester=&department='+department+'&course_number='+course_nbr+'&course_title=&unique=&instructor_first=&instructor_last='+profname+'&course_type=In+Residence&search=Search');
@@ -67,121 +75,143 @@ chrome.runtime.sendMessage({greeting: "hello"}, function(response) {
}, butdelay); }, butdelay);
}); });
$(document).keydown(function(e) { $(document).keydown(function(e) {
if (e.keyCode == 27) { if (e.keyCode == 27) {
$(".modal").fadeOut(fadetime); $(".modal").fadeOut(fadetime);
//or }
// window.close(); });
}
});
}); });
function getCourseInfo(row){ function Course(coursename, unique, profname, times, dates, locations, status, link){
$(".dateTimePlace").remove(); this.coursename = coursename;
$('table').find('tr').each(function(){ this.unique = unique;
if($(this).find('td').hasClass("course_header")){ this.profname = profname;
coursename = $(this).find('td').text() + ""; this.times = times;
} this.dates = dates;
if($(this).is(row)){ this.locations = locations;
profurl = $(this).find('td[data-th="Unique"] a').prop('href'); this.status = status;
uniquenum = $(this).find('td[data-th="Unique"]').text(); this.link = link;
status = $(this).find('td[data-th="Status"]').text();
console.log(status);
profname = $(this).find('td[data-th="Instructor"]').text().split(', ')[0];
profinit = $(this).find('td[data-th="Instructor"]').text().split(', ')[1];
if(profname.indexOf(" ") == 0){
profname = profname.substring(1);
}
var numlines = $(this).find('td[data-th="Days"]>span').length;
for(var i=0; i<numlines;i++){
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 place = $(this).find('td[data-th="Room"]>span:eq('+i+')').text();
$(".topbuttons").before('<h2 class="dateTimePlace">'+makeLine(date,time,place)+'</th>');
// makeLine(date,time,place);
}
return false;
}
});
if(typeof coursename == 'undefined'){
coursename = $("#details h2").text();
console.log(profname+" "+profinit);
profinit = profinit.substring(0,1);
profurl = document.URL;
} }
//console.log(coursename);
getDescription(); function getCourseInfo(row){
department = coursename.substring(0,coursename.search(/\d/)-2); $(".dateTimePlace").remove();
//console.log(department); $('table').find('tr').each(function(){
course_nbr = coursename.substring(coursename.search(/\d/),coursename.indexOf(" ",coursename.search(/\d/))); if($(this).find('td').hasClass("course_header")){
coursename = $(this).find('td').text() + "";
}
if($(this).is(row)){
profurl = $(this).find('td[data-th="Unique"] a').prop('href');
uniquenum = $(this).find('td[data-th="Unique"]').text();
status = $(this).find('td[data-th="Status"]').text();
console.log(status);
profname = $(this).find('td[data-th="Instructor"]').text().split(', ')[0];
profinit = $(this).find('td[data-th="Instructor"]').text().split(', ')[1];
if(profname.indexOf(" ") == 0){
profname = profname.substring(1);
}
var numlines = $(this).find('td[data-th="Days"]>span').length;
for(var i=0; i<numlines;i++){
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 place = $(this).find('td[data-th="Room"]>span:eq('+i+')').text();
dates.push(date);
times.push(time);
locations.push(place);
$(".topbuttons").before('<h2 class="dateTimePlace">'+makeLine(date,time,place)+'</th>');
// makeLine(date,time,place);
}
return false;
}
});
if(typeof coursename == 'undefined'){
coursename = $("#details h2").text();
console.log(profname+" "+profinit);
profinit = profinit.substring(0,1);
profurl = document.URL;
}
//console.log(coursename);
getDescription();
department = coursename.substring(0,coursename.search(/\d/)-2);
//console.log(department);
course_nbr = coursename.substring(coursename.search(/\d/),coursename.indexOf(" ",coursename.search(/\d/)));
} }
//MWF //MWF
//TTH //TTH
//MTHF //MTHF
function makeLine(date, time, place){ function makeLine(date, time, place){
var arr = new Array(); var arr = new Array();
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"));
} }
else { else {
if(letter != "H"){ if(letter != "H"){
arr.push(days.get(letter)); arr.push(days.get(letter));
}
} }
} }
} if(arr.length > 2){
if(arr.length > 2){ for(var i = 0; i<arr.length;i++){
for(var i = 0; i<arr.length;i++){ if(i < arr.length-1){
if(i < arr.length-1){ output+=arr[i]+", "
output+=arr[i]+", " }
} if(i == arr.length-2){
if(i == arr.length-2){ output+= "and ";
output+= "and "; }
} if(i == arr.length-1){
if(i == arr.length-1){ output+=arr[i];
output+=arr[i]; }
} }
} }
} else if(arr.length == 2){
else if(arr.length == 2){ output = arr[0]+" and "+arr[1];
output = arr[0]+" and "+arr[1]; }
} else{
else{ output+=arr[0];
output+=arr[0]; }
} 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 getDistribution(){ function getDistribution(){
var query = "select * from agg"; var query = "select * from agg";
query += " where dept like '%"+department+"%'"; query += " where dept like '%"+department+"%'";
query += " and prof like '%"+profname+"%'"; query += " and prof like '%"+profname+"%'";
query += " and course_nbr like '%"+course_nbr+"%'"; query += " and course_nbr like '%"+course_nbr+"%'";
// console.log(query); // console.log(query);
var res = grades.exec(query)[0]; var res = grades.exec(query)[0];
// console.log(res); // console.log(res);
var output = ""; var output = "";
openDialog(department,coursename,"aggregate",profname,res); openDialog(department,coursename,"aggregate",profname,res);
} }
function openDialog(dep,cls,sem,professor,res){ function openDialog(dep,cls,sem,professor,res){
$(".modal").fadeIn(fadetime); $(".modal").fadeIn(fadetime);
var data; var c = new Course(coursename,uniquenum, profname, times, dates, locations, status, profurl);
if(typeof res == 'undefined'){ chrome.runtime.sendMessage({command: "alreadyContains",course: c}, function(response) {
data = []; console.log("Already Contains: "+response.alreadyContains);
} if(response.alreadyContains){
else{ $("#saveCourse").text("Remove Course -");
data = res.values[0]; }
} else{
var modal = document.getElementById('myModal'); $("#saveCourse").text("Add Course +");
var span = document.getElementsByClassName("close")[0]; }
modal.style.display = "block"; });
var data;
if(typeof res == 'undefined'){
data = [];
}
else{
data = res.values[0];
}
var modal = document.getElementById('myModal');
var span = document.getElementsByClassName("close")[0];
modal.style.display = "block";
$(".title").text(prettifyTitle()); $(".title").text(prettifyTitle());
var color = "black"; var color = "black";
if(status.includes("open")){ if(status.includes("open")){
color = "#4CAF50"; color = "#4CAF50";
} }
@@ -191,19 +221,19 @@ var color = "black";
else if(status.includes("closed") || status.includes("cancelled")){ else if(status.includes("closed") || status.includes("cancelled")){
color = "#F44336"; color = "#F44336";
} }
$(".title").append("<span style='color:"+color+";font-size:medium;'>"+" #"+uniquenum+"</>"); $(".title").append("<span style='color:"+color+";font-size:medium;'>"+" #"+uniquenum+"</>");
var name; var name;
if(profname == ""){ if(profname == ""){
name = "Undecided Professor "; name = "Undecided Professor ";
if(typeof res == 'undefined'){ if(typeof res == 'undefined'){
}
}
else{
name = profinit+". "+profname.substring(0,1)+profname.substring(1).toLowerCase();
} }
}
else{
name = profinit+". "+profname.substring(0,1)+profname.substring(1).toLowerCase();
}
$(".profname").text("with "+ name); $(".profname").text("with "+ name);
//console.log(coursename); //console.log(coursename);
span.onclick = function() { span.onclick = function() {
$(".modal").fadeOut(200); $(".modal").fadeOut(200);