here it goes. pushing v1.4.0 to stable. css next then release notes on gh releases. might take a while to sink in since there are major changes in css and js and both have to be latest
diff --git a/init.js b/init.js
index a239c7e..ee83b4b 100644
--- a/init.js
+++ b/init.js
@@ -1,9 +1,10 @@
var dtps = {
- ver: 120,
- readableVer: "v1.2.0",
+ ver: 140,
+ readableVer: "v1.4.0",
trackSuffix: "",
showLetters: false,
- unreadAnn: 0
+ unreadAnn: 0,
+ latestStream: []
};
dtps.changelog = function () {
fluid.cards.close(".card.focus")
@@ -17,12 +18,11 @@
jQuery("body").append(`<div id="TB_overlay" style="position: fixed;"> </div><div id="TB_window" role="dialog" aria-modal="true" aria-labelledby="TB_title" style="width: 800px; height: 540px;margin: 0 calc(50% - 400px); top: calc(50% - 290px);"><div id="TB_closeAjaxWindow" class="tb_title_bar" role="heading"><a href="javascript:;" onclick="TB_remove();" id="TB_closeWindowButton" aria-hidden="true"><i class="icon-close"></i></a><div id="TB_title" class="tb_title">Power+` + dtps.trackSuffix + `</div><div id="TB_ajaxContent" role="main" style="width: 770px; height: 434px;">
<h2>Welcome to Power+` + dtps.trackSuffix + `</h2>
<h4>` + dtps.readableVer + `</h4>
-<li>Power+` + dtps.trackSuffix + ` is meant to be simple, so many PowerSchool features will be left out</li>
-<li>Power+` + dtps.trackSuffix + ` does not store any personal user data (such as grades). Data Power+` + dtps.trackSuffix + ` does use and needs to store (such as prefrences and version info for changelogs) is stored locally on your computer, never in any online database. Power+` + dtps.trackSuffix + ` uses Google Analytics to track how many people are using Power+` + dtps.trackSuffix + ` and will never log your ID or IP address with Google Analytics</li>
-<li>Power+` + dtps.trackSuffix + ` only reads data from PowerSchool. Power+` + dtps.trackSuffix + ` will never edit, write, or delete data of any kind on your PowerSchool account</li>
-<li>Power+` + dtps.trackSuffix + ` needs to be loaded with the bookmark script every time (unless using the chrome extension). You can always use PowerSchool as normal by reloading and not clicking the bookmark</li>
-<li>Report bugs and send feedback by clicking the feedback button at the top right corner</li>
-<li><b>Power+` + dtps.trackSuffix + ` may have bugs that cause it to display an inaccurate representation of your grades and assignments. Use Power+ at your own risk.</b></li>
+<p>Things to keep in mind when using Power+</p>
+<li>Power+ can't fully replace PowerSchool yet. Many PowerSchool features are not included in Power+.</li>
+<li>To use Power+, you have to visit PowerSchool, then run the bookmark script. You can choose stop using Power+ at any time by not using the bookmark script.</li>
+<li>Report bugs and send feedback by clicking the feedback button at the top right corner.</li>
+<li><b>Power+` + dtps.trackSuffix + ` may have bugs that cause it to display an inaccurate representation of your grades and assignments. Use Power+` + dtps.trackSuffix + ` at your own risk.</b></li>
</div><div id="TB_actionBar" style=""><span><input class="button button" onclick="ThickBox.close();" type="button" value="Cancel"><input class="button button" onclick="ThickBox.close(); localStorage.setItem('dtpsInstalled', 'true'); dtps.render();" type="button" value="Accept & Continue"></span>
`)
};
@@ -112,6 +112,7 @@
}
dtps.init = function () {
dtps.log("Starting DTPS " + dtps.readableVer + "...");
+ fluidThemes = [ "midnight", "nitro", "aquatic", "rainbow" ];
sudoers = ["10837719", "10838212", "10894474", "10463823"]
if (sudoers.includes(HaikuContext.user.login)) { jQuery("body").addClass("sudo"); dtps.log("Sudo mode enabled"); }
og = ["10894474", "10837719", "10838212"]
@@ -124,6 +125,7 @@
dtps.showChangelog = false;
dtps.updateScript = false;
dtps.user = HaikuContext.user;
+ dtps.user.prof = jQuery(".avatar_circle.avatar-img").attr("src")
dtps.classColors = [];
jQuery.getScript("https://www.googletagmanager.com/gtag/js?id=UA-105685403-3", function() {
window.dataLayer = window.dataLayer || [];
@@ -135,9 +137,27 @@
});
});
+ jQuery.getScript("https://www.gstatic.com/firebasejs/5.7.0/firebase.js", function() {
+// Initialize Firebase
+ var config = {
+ apiKey: "AIzaSyB7Oek4HHBvazM5e0RppZMbZ8qg6RjSDdU",
+ authDomain: "project-dtps.firebaseapp.com",
+ databaseURL: "https://project-dtps.firebaseio.com",
+ projectId: "project-dtps",
+ storageBucket: "project-dtps.appspot.com",
+ messagingSenderId: "117676227556"
+ };
+ firebase.initializeApp(config);
+ dtps.authProvider = new firebase.auth.GoogleAuthProvider();
+ firebase.auth().useDeviceLanguage();
+ dtps.authProvider.addScope('https://www.googleapis.com/auth/classroom.courses.readonly');
+ dtps.authProvider.addScope('https://www.googleapis.com/auth/classroom.coursework.me.readonly');
+});
+ jQuery.getScript("https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js")
jQuery.getScript("https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js", function() {
jQuery.getScript("https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.js")
})
+ jQuery.getScript('https://cdnjs.cloudflare.com/ajax/libs/fuse.js/3.3.0/fuse.min.js');
if ((window.location.host !== "dtechhs.learning.powerschool.com") && ((window.location.host !== "mylearning.powerschool.com") || (HaikuContext.user.login.split(".")[0] !== "dtps"))) {
dtps.shouldRender = false;
dtps.alert("Unsupported school", "Power+ only works at Design Tech High School");
@@ -147,7 +167,7 @@
dtps.showChangelog = true;
//Load fluid JS modules early for changelogs
$ = jQuery;
- fluidThemes = [ "midnight", "nitro", "aquatic", "rainbow" ];
+ jQuery("body").addClass("notwemoji");
jQuery.getScript('https://dtps.js.org/fluid.js');
dtps.shouldRender = true;
dtps.alert("Loading...", "Updating to Power+ " + dtps.readableVer);
@@ -156,6 +176,11 @@
dtps.shouldRender = false;
dtps.alert("Unsupported Account", "Power+ only works on student accounts");
} else {
+ if (dtpsLoader < 2) {
+ dtps.updateScript = true;
+ dtps.shouldRender = true;
+ dtps.alert("Loading...", "Make sure to update your bookmark script");
+ } else {
if (window.location.pathname.split("/")[3] !== "portal") {
dtps.shouldRender = false;
dtps.alert("Page error", 'Go to your <a href="/u/' + HaikuContext.user.login + '/portal">PowerSchool homepage</a> to load Power+');
@@ -164,7 +189,7 @@
dtps.alert("Loading...");
}
-
+ }
}
}
@@ -186,7 +211,7 @@
})[1].replace("eclass_", "");
var loc = eclass.children("div.eclass_filter").attr("onclick").split("/");
dtps.classColors.push({id: id, col: col, loc: loc});
- dtps.webReq("psGET", "/" + loc[1] + "/" + loc[2] + "/assignment");
+ dtps.webReq("psGET", "/" + loc[1] + "/" + loc[2] + "/assignment?page=1");
dtps.webReq("psGET", "/" + loc[1] + "/" + loc[2] + "/cms_page/view");
dtps.webReq("psGET", "/" + loc[1] + "/" + loc[2] + "/grades", function(resp, q) {
var iTmp = null;
@@ -243,11 +268,11 @@
}
dtps.checkReady = function(num) {
//dtps.log(num + " reporting as READY total of " + dtps.classesReady);
- if ((dtps.selectedClass == "stream") && (dtps.classesReady == dtps.classes.length)) {
+ if ((dtps.selectedClass == "dash") && (dtps.classesReady == dtps.classes.length)) {
dtps.log("All classes ready, loading master stream");
dtps.masterStream(true);
} else {
- if ((dtps.selectedClass == "stream") && (dtps.classesReady < dtps.classes.length)) {
+ if ((dtps.selectedClass == "dash") && (dtps.classesReady < dtps.classes.length)) {
dtps.masterStream();
}
}
@@ -303,7 +328,7 @@
}
dtps.classStream = function(num, renderOv) {
dtps.log("rendering stream for " + num)
- if (!renderOv) dtps.showClasses();
+ if (!renderOv) dtps.showClasses();
if ((dtps.selectedClass == num) && (dtps.selectedContent == "stream")) { if (!renderOv) { jQuery(".classContent").html(`
<div class="spinner">
<div class="bounce1"></div>
@@ -311,8 +336,18 @@
<div class="bounce3"></div>
</div>
`); } }
- dtps.webReq("psGET", "/" + dtps.classes[num].loc + "/assignment", function(resp) {
+ var allData = [];
+ var total = null;
+ function call(pag) {
+ dtps.webReq("psGET", "/" + dtps.classes[num].loc + "/assignment?page=" + pag, function(resp) {
var data = jQuery(resp).find("table.list.hover_glow tbody").children("tr:not(.head)").toArray();
+ allData = allData.concat(data);
+ if (total == null) total = (jQuery(resp).find(".padtb").children(".pagination.right").children("ul").children("li").length / 2) - 2;
+ if (pag < total) { call(pag + 1) } else { step2(allData) }
+ });
+ }
+ call(1)
+ function step2(data) {
dtps.classes[num].stream = [];
dtps.classes[num].streamlist = [];
dtps.classes[num].streamitems = [];
@@ -335,12 +370,13 @@
col: dtps.classes[num].col,
loc: dtps.classes[num].loc,
turnedIn: Boolean(assignment.children("td:nth-child(5)").children("i").length),
- class: num
+ class: num,
+ subject: dtps.classes[num].subject
});
dtps.classes[num].streamitems.push(assignment.find("a").attr("onclick").split("/")[5].replace("')", ""));
var turnInDom = "";
if (Boolean(assignment.children("td:nth-child(5)").children("i").length)) {
- turnInDom = `<div class="beta notice turnin"><i class="material-icons">assignment_turned_in</i> Turned in</div>`
+ turnInDom = `<div class="beta notice turnin"><i class="material-icons">assignment_turned_in</i></div>`
}
dtps.classes[num].streamlist.push(`
<div class="card assignment">
@@ -368,31 +404,36 @@
} else {
if (jQuery(data[i]).find("a").attr("href")) {
var id = dtps.classes[num].streamitems.indexOf(jQuery(data[i]).find("a").attr("href").split("/")[5])
- if (id && (id != -1)) {
+ if (id != -1) {
dtps.classes[num].stream[id].grade = jQuery(data[i]).children("td:nth-child(4)").text().replace(/\s/g, "");
dtps.classes[num].stream[id].letter = jQuery(data[i]).children("td:nth-child(6)").text().replace(/\s/g, "");
if (prevWeight !== -1) dtps.classes[num].stream[id].weight = dtps.classes[num].weights[prevWeight].weight;
- if (prevWeight !== -1) dtps.classes[num].weights[prevWeight].assignments.push(dtps.classes[num].stream[id].title + ": " + dtps.classes[num].stream[id].grade);
+ if ("ABC".includes(dtps.classes[num].stream[id].letter.toArray()[0])) {
+ var earnedTmp = dtps.classes[num].stream[id].grade.split("/")[0];
+ } else {
+ var earnedTmp = dtps.classes[num].stream[id].letter;
+ }
+ if (prevWeight !== -1) dtps.classes[num].weights[prevWeight].assignments.push(dtps.classes[num].stream[id].title + ": " + earnedTmp + "/" + dtps.classes[num].stream[id].grade.split("/")[1]);
}
}
}
}
dtps.classes[num].streamlist = [];
- if ((dtps.selectedClass == num) && (dtps.selectedContent == "stream")) { if (!renderOv) { jQuery(".classContent").html(dtps.renderStream(dtps.classes[num].stream, dtps.classes[num].col)); } }
+ if ((dtps.selectedClass == num) && (dtps.selectedContent == "stream")) { if (!renderOv) { jQuery(".classContent").html(dtps.renderStream(dtps.classes[num].stream)); } }
if (dtps.selectedClass == num) { if (dtps.classes[dtps.selectedClass].weights.length) { $(".btns .btn.grades").show(); } }
dtps.classesReady++;
dtps.checkReady(num);
});
- });
+ }
}
-dtps.renderStream = function(stream) {
+dtps.renderStream = function(stream, searchRes) {
var streamlist = [];
for (var i = 0; i < stream.length; i++) {
var due = "Due " + stream[i].due;
if (due.includes("n/a")) var due = "";
var turnInDom = "";
if (stream[i].turnedIn) {
- turnInDom = `<div class="beta notice turnin"><i class="material-icons">assignment_turned_in</i> Turned in</div>`
+ turnInDom = `<div class="beta notice turnin"><i class="material-icons">assignment_turned_in</i></div>`
}
if ((stream[i].grade !== "-") && (stream[i].grade)) {
if ("ABC".includes(stream[i].letter.toArray()[0])) {
@@ -400,37 +441,65 @@
} else {
var earnedTmp = stream[i].letter;
}
- if (dtps.showLetters) earnedTmp = stream[i].letter;
var wFormat = "";
if (stream[i].weight) wFormat = stream[i].weight.replace(/ *\([^)]*\) */g, "");
- if (wFormat == "undefined") wFormat = "";
+ if (wFormat == "undefined") { wFormat = "" } else { wFormat = `<span class="weighted">` + wFormat + `</span>`} ;
+ var onclick = `dtps.assignment(` + stream[i].id + `, ` + stream[i].class + `)`
+ if (stream[i].google) {
+ var onclick = `window.open('` + stream[i].url + `')`
+ }
streamlist.push(`
- <div onclick="dtps.assignment(` + stream[i].class + `, ` + i + `)" class="card graded assignment ` + stream[i].col + `">
+ <div onclick="` + onclick + `" class="card graded assignment ` + stream[i].col + `">
<div class="points">
- <div class="earned">` + earnedTmp + `</div>
- <div class="total">/` + stream[i].grade.split("/")[1] + `</div>
+ <div class="earned numbers">` + earnedTmp + `</div>
+ <div class="earned letters">` + stream[i].letter + `</div>
+ <div class="total possible">/` + stream[i].grade.split("/")[1] + `</div>
+ <div class="total percentage">` + ((Number(stream[i].grade.split("/")[0]) / Number(stream[i].grade.split("/")[1])) * 100) + `%</div>
</div>
<h4>` + stream[i].title + `</h4>
- <h5>` + due + ` <span class="weighted">` + wFormat + `</span>` + turnInDom + `</h5>
+ <h5>` + due + ` ` + wFormat + turnInDom + `</h5>
</div>
`);
} else {
streamlist.push(`
- <div onclick="dtps.assignment(` + stream[i].class + `, ` + i + `)" class="card assignment ` + stream[i].col + `">
+ <div onclick="dtps.assignment(` + stream[i].id + `, ` + stream[i].class + `)" class="card assignment ` + stream[i].col + `">
<h4>` + stream[i].title + `</h4>
<h5>` + due + turnInDom + `</h5>
</div>
`);
}
}
- return streamlist.join("");
+ if (searchRes == undefined) {
+ dtps.latestStream = stream;
+ dtps.fuse = new Fuse(stream, {
+ shouldSort: true,
+ threshold: 0.6,
+ keys: [ "title", "id", "due", "subject" ]
+});
+ searchRes = "";
+}
+ return `<div style="text-align: right;"><input value="` + searchRes + `" onchange="dtps.search()" class="search" placeholder="Search assignments" type="text" /></div>` + streamlist.join("");
+ //return streamlist.join("");
+}
+dtps.search = function() {
+if (dtps.selectedClass == "dash") {
+ if ($("input.search").val() == "") {
+ jQuery(".classContent .stream").html(dtps.renderStream(dtps.latestStream, ""))
+ } else {
+ jQuery(".classContent .stream").html(dtps.renderStream(dtps.fuse.search($("input.search").val()), $("input.search").val()))
+ }
+ $(".card.assignment").addClass("color");
+} else {
+ if ($("input.search").val() == "") {
+ jQuery(".classContent").html(dtps.renderStream(dtps.latestStream, ""))
+ } else {
+ jQuery(".classContent").html(dtps.renderStream(dtps.fuse.search($("input.search").val()), $("input.search").val()))
+ }
+}
}
dtps.masterStream = function(doneLoading) {
dtps.showClasses();
- if (dtps.masterContent == "cal") {
- dtps.calendar(doneLoading);
- }
- if ((dtps.selectedClass == "stream") && (dtps.masterContent == "list")) {
+ if ((dtps.selectedClass == "dash") && (dtps.masterContent == "assignments")) {
jQuery(".classContent").html(`
<div class="spinner">
<div class="bounce1"></div>
@@ -453,9 +522,55 @@
<div class="bounce2"></div>
<div class="bounce3"></div>
</div>`;
+ } else {
+ dtps.logGrades();
}
- if ((dtps.selectedClass == "stream") && (dtps.masterContent == "list")) {
- jQuery(".classContent").html(loadingDom + dtps.renderStream(buffer.sort(function(a, b){
+ var gradeTrendDom = ""
+ if ((window.localStorage.dtpsGradeTrend !== "false") && (window.localStorage.dtpsGradeTrend !== undefined)) {
+ if (Object.keys(JSON.parse(window.localStorage.dtpsGradeTrend)).length > 2) {
+ gradeTrendDom = `<div class="card" style="padding: 5px;margin:25px;margin-right:0px;width: 100%;"><canvas id="gradeTrendChart"></canvas></div>`
+ } else {
+ gradeTrendDom = `<div onclick="fluid.modal('.card.trend')" class="card" style="margin:25px; margin-right:0px;background-color: #7b7b7b;color: white;padding: 10px 20px;cursor: pointer;"><i class="material-icons" style="margin-right: 10px;font-size: 32px;display: inline-block;vertical-align: middle;">timeline</i><h5 style="display: inline-block;vertical-align: middle;margin-right: 5px;">Not enough data</h5></div>`
+ }
+ }
+ if ((dtps.selectedClass == "dash") && (dtps.masterContent == "assignments")) {
+ jQuery(".classContent").html(`
+<div class="dash cal" style="width: 40%;display: inline-block; vertical-align: top;">
+<div id="calendar" class="card" style="width: 100%;margin: 25px;">
+</div>
+` + gradeTrendDom + `
+</div>
+<div style="width: 59%; display: inline-block;" class="dash stream">
+</div>
+`)
+ if ((window.localStorage.dtpsGradeTrend !== "false") && (window.localStorage.dtpsGradeTrend !== undefined)) {
+ if (Object.keys(JSON.parse(window.localStorage.dtpsGradeTrend)).length > 2) {
+ var gradeData = JSON.parse(window.localStorage.dtpsGradeTrend)
+ var dataSets = [];
+ for (var ii = 0; ii < dtps.classes.length; ii++) {
+ var dataPoints = [];
+ for (var i = 0; i < Object.keys(gradeData).length; i++) dataPoints.push(Number(gradeData[Object.keys(gradeData)[i]][dtps.classes[ii].id]))
+ var ctx = document.getElementById('gradeTrendChart').getContext('2d');
+ var styles = window.getComputedStyle($(".class." + ii)[0]);
+ dataSets.push({ label: dtps.classes[ii].subject, borderColor: styles.getPropertyValue('--light'), data: dataPoints})
+ }
+
+var chart = new Chart(ctx, { type: 'line', data: { labels: Object.keys(gradeData),
+ datasets: dataSets.sort(function(a, b){
+ var keyA = a.data[a.data.length - 1],
+ keyB = b.data[b.data.length - 1];
+ // Compare the 2 dates
+ if(keyA < keyB) return -1;
+ if(keyA > keyB) return 1;
+ return 0;
+ })
+ }, options: {}
+});
+ }
+ }
+
+ dtps.announcements();
+ jQuery(".classContent .stream").html(loadingDom + dtps.renderStream(buffer.sort(function(a, b){
var year = new Date().getFullYear();
var today = new Date().toHumanString();
var keyA = new Date(a.due.replace("Today", today).replace(year + " at", "")).setYear(year),
@@ -464,8 +579,10 @@
if(keyA < keyB) return 1;
if(keyA > keyB) return -1;
return 0;
- }))); }
+ })));
+ }
$(".card.assignment").addClass("color");
+ dtps.calendar(doneLoading);
}
dtps.getPage = function(loc, id) {
if (id == undefined) var id = dtps.selectedPage;
@@ -501,33 +618,67 @@
if (dtps.classes[num].weights.length) {
$(".btns .btn.grades").show();
var weightsTmp = [];
+ var sidebarTmp = [];
+ var DVs = 0;
for (var i = 0; i < dtps.classes[num].weights.length; i++) {
var assignTmp = [];
for (var ii = 0; ii < dtps.classes[num].weights[i].assignments.length; ii++) {
assignTmp.push(`<p>` + dtps.classes[num].weights[i].assignments[ii] + `</p>`)
+ if (!((dtps.classes[num].weights[i].weight.includes("Success")) || (dtps.classes[num].weights[i].weight.includes("SS")))) {
+ var parts = dtps.classes[num].weights[i].assignments[ii].split(":");
+ if (parts[parts.length - 1].includes("DV")) DVs++;
+ if (parts[parts.length - 1].includes("M")) DVs++;
+ if (parts[parts.length - 1].includes("INC")) DVs++;
+ }
}
- if (Number(dtps.classes[num].weights[i].weight.match(/\(([^)]+)\)/)[1].slice(0,-1)) < 10) {
- weightsTmp.push(`<div style="height: 40px;" class="weight card">
-<div class="open">
-<h4 onclick="if (Number($(this).parent().parent().css('height').slice(0,-2)) <= 400) {$(this).parent().parent().toggleClass('open')}">` + dtps.classes[num].weights[i].weight + `</h4>
-` + assignTmp.join("") + `
-</div>
-<div class="close">
-<p onclick="if (Number($(this).parent().parent().css('height').slice(0,-2)) <= 400) {$(this).parent().parent().toggleClass('open')}">` + dtps.classes[num].weights[i].weight + ` (click to expand)</p>
-</div>
-</div>`);
- } else {
- weightsTmp.push(`<div style="height: calc(` + Number(dtps.classes[num].weights[i].weight.match(/\(([^)]+)\)/)[1].slice(0,-1)) + `% - 40px);" class="weight card">
-<h4 onclick="if (Number($(this).parent().css('height').slice(0,-2)) <= 400) {$(this).parent().toggleClass('open')}">` + dtps.classes[num].weights[i].weight + `</h4>
-` + assignTmp.join("") + `
-</div>`);
+ dtps.classes[num].weights[i].icon = "";
+ if (dtps.classes[num].weights[i].weight.includes("Success") || dtps.classes[num].weights[i].weight.includes("SS")) dtps.classes[num].weights[i].icon = `<i class="material-icons">star</i> `
+ if (dtps.classes[num].weights[i].weight.includes("Comprehension") || dtps.classes[num].weights[i].weight.includes("CC")) dtps.classes[num].weights[i].icon = `<i class="material-icons">done</i> `
+ if (dtps.classes[num].weights[i].weight.includes("Performance") || dtps.classes[num].weights[i].weight.includes("PT"))dtps.classes[num].weights[i].icon = `<i class="material-icons">assessment</i> `
+ weightsTmp.push(`<div style="display: none;" class="weight ` + i + `"><h4>` + dtps.classes[num].weights[i].weight + `</h4>` + assignTmp.join("") + `</div>` );
+ sidebarTmp.push(`<div onclick="$('.sidenav .item').removeClass('active'); $(this).addClass('active'); $('.weight').hide(); $('.weight.` + i + `').show();" class="item">
+ ` + dtps.classes[num].weights[i].icon + dtps.classes[num].weights[i].weight.replace("Comprehension Check", "CC").replace("Success Skills", "SS").replace("Performance Task", "PT") + `
+ </div>`);
}
+ var headsUp = `<div class="card" style="background-color: #3cc15b;color: white;padding: 10px 20px;"><i class="material-icons" style="margin-right: 10px;font-size: 32px;display: inline-block;vertical-align: middle;">check_circle_outline</i><h5 style="display: inline-block;vertical-align: middle;margin-right: 5px;">On track to pass <span style="font-size: 18px;">Power+ didn't detect any DVs in any of your CCs or PTs</span></h5></div>`
+ if (DVs > 0) {
+ var headsUp = `<div class="card" style="background-color: #c14d3c;color: white;padding: 10px 20px;"><i class="material-icons" style="margin-right: 10px;font-size: 32px;display: inline-block;vertical-align: middle;">cancel</i><h5 style="display: inline-block;vertical-align: middle;margin-right: 5px;">You're at risk of failing this class <span style="font-size: 18px;">Power+ detected ` + DVs + ` DV(s) in your CCs/PTs</span></h5></div>`
}
- jQuery(".classContent").html(`
- <div style="height: 1000px;" class="weight parent">
- ` + weightsTmp.join("") + `
+ var gradeTrendDom = `<div onclick="fluid.modal('.card.trend')" class="card" style="background-color: #3c8ac1;color: white;padding: 10px 20px;cursor: pointer;"><i class="material-icons" style="margin-right: 10px;font-size: 32px;display: inline-block;vertical-align: middle;">timeline</i><h5 style="display: inline-block;vertical-align: middle;margin-right: 5px;">Grade trend <span style="font-size: 18px;">Keep track of your grades over time with grade trend. Click to learn more.</span></h5></div>`
+ if ((window.localStorage.dtpsGradeTrend !== "false") && (window.localStorage.dtpsGradeTrend !== undefined)) {
+ if (Object.keys(JSON.parse(window.localStorage.dtpsGradeTrend)).length > 2) {
+ var gradeTrendDom = `<div class="card" style="padding: 5px;"><canvas id="gradeTrendChart"></canvas></div>`
+ } else {
+ var gradeTrendDom = `<div onclick="fluid.modal('.card.trend')" class="card" style="background-color: #7b7b7b;color: white;padding: 10px 20px;cursor: pointer;"><i class="material-icons" style="margin-right: 10px;font-size: 32px;display: inline-block;vertical-align: middle;">timeline</i><h5 style="display: inline-block;vertical-align: middle;margin-right: 5px;">Not enough data <span style="font-size: 18px;">Power+ doesn't have enough grade data to show a graph yet</span></h5></div>`
+ }
+ }
+ jQuery(".classContent").html(headsUp + gradeTrendDom + `
+<div style="height: 700px;" class="card withnav">
+ <div class="sidenav">
+ <div class="title">
+ <h5>Gradebook</h5>
+ <p>` + dtps.classes[num].name + `</p>
</div>
+ ` + sidebarTmp.join("") + `
+ </div>
+ <div class="content">
+ ` + weightsTmp.join("") + `
+ </div>
+</div>
`);
+ if ((window.localStorage.dtpsGradeTrend !== "false") && (window.localStorage.dtpsGradeTrend !== undefined)) {
+ if (Object.keys(JSON.parse(window.localStorage.dtpsGradeTrend)).length > 2) {
+ var gradeData = JSON.parse(window.localStorage.dtpsGradeTrend)
+ var dataPoints = [];
+ for (var i = 0; i < Object.keys(gradeData).length; i++) dataPoints.push(Number(gradeData[Object.keys(gradeData)[i]][dtps.classes[num].id]))
+ var ctx = document.getElementById('gradeTrendChart').getContext('2d');
+ var styles = window.getComputedStyle($(".class." + num)[0]);
+var chart = new Chart(ctx, { type: 'line', data: { labels: Object.keys(gradeData),
+ datasets: [{ label: "Grade trend", backgroundColor: styles.getPropertyValue('--norm'), borderColor: styles.getPropertyValue('--light'), data: dataPoints}]
+ }, options: {}
+});
+ }
+ }
} else {
$(".btns .btn.grades").hide();
$(".btns .btn").removeClass("active");
@@ -537,7 +688,8 @@
}
}
}
-dtps.assignment = function(classNum, streamNum) {
+dtps.assignment = function(id, classNum) {
+ var streamNum = dtps.classes[classNum].streamitems.indexOf(id.toString());
var assignment = dtps.classes[classNum].stream[streamNum];
$(".card.details").html(`
<i onclick="fluid.cards.close('.card.details')" class="material-icons close">close</i>
@@ -548,7 +700,22 @@
var handInDom = `<div class="btn" onclick="window.location.href = '/` + assignment.loc + `/dropbox/assignment/` + assignment.id + `#/'"><i class="material-icons">assignment</i> Hand In</div>`
if (assignment.turnedIn) handInDom = `<div class="btn" onclick="window.location.href = '/` + assignment.loc + `/dropbox/assignment/` + assignment.id + `#/'"><i class="material-icons">assignment_returned</i> Resubmit</div>`
dtps.webReq("assignGET", "/" + assignment.loc + "/assignment/view/" + assignment.id, function(data) {
- $(".card.details").html(`<i onclick="fluid.cards.close('.card.details')" class="material-icons close">close</i>` + data + `
+ var dom = jQuery("<div />", {html: data});
+ var props = dom.children("div").siblings("table").children("tbody").children("tr:has(.label.right)");
+ var list = [];
+ for (var i = 0; i < props.length; i++) {
+ var prop = jQuery(props[i]).text().replace(/^\s+|\s+$/g, "").replace(/\r?\n|\r/g, "").split(/:(.+)/);
+ var icon = "";
+ if (prop[0].includes("Posted")) icon = `<i class="material-icons">add_box</i>`
+ if (prop[0].includes("Due")) icon = `<i class="material-icons">access_time</i>`
+ if (prop[0].includes("Total")) icon = `<i class="material-icons">assessment</i>`
+ if (prop[0] && prop[1]) {
+ list.push(`<div style="cursor: auto;margin: 0px; padding: 10px 15px;" class="item">` + icon + "<b>" + prop[0] + "</b>: " + prop[1] + `</div>`)
+ jQuery(props[i]).remove();
+ }
+ }
+ dom.children("div").siblings("table").before(`<br /><div class="list">` + list.join("") + `</div><br /><br />`)
+ $(".card.details").html(`<i onclick="fluid.cards.close('.card.details')" class="material-icons close">close</i>` + dom.html() + `
` + handInDom + `
<div class="btn sudo" onclick="dtps.myWork('` + assignment.loc + `', ` + assignment.id + `)"><i class="material-icons">experiment</i> View Work</div>
`);
@@ -560,67 +727,44 @@
});
}
dtps.announcements = function() {
- if (dtps.selectedClass == "announcements") {
- jQuery(".classContent").html(`
- <div class="spinner">
- <div class="bounce1"></div>
- <div class="bounce2"></div>
- <div class="bounce3"></div>
- </div>
- `); }
dtps.webReq("letPOST", "/u/" + dtps.user.login + "/portal/portlet_annc", function(resp) {
dtps.raw = resp;
var ann = jQuery(resp).children("tbody").children("tr").toArray();
var announcements = [];
- if (window.localStorage.unreadAnn) {
- if (window.localStorage.unreadAnn < ann.length) {
- dtps.unreadAnn = ann.length - window.localStorage.unreadAnn;
- localStorage.setItem('unreadAnn', ann.length);
- $("#annLabel").html("Announcements (" + dtps.unreadAnn + ")");
- } else {
- if (window.localStorage.unreadAnn > ann.length) localStorage.setItem('unreadAnn', ann.length);
- }
- } else {
- localStorage.setItem('unreadAnn', ann.length);
- }
for (var i = 0; i < ann.length; i++) {
if (jQuery(ann[i]).children("td")[1] !== undefined) {
var loc = jQuery(ann[i]).children("td:has(a)").children("a").attr("href").split("/");
var psClass = dtps.classLocs.indexOf(loc[1] + "/" + loc[2]);
var col = "";
- if (psClass !== -1) col = dtps.classes[psClass].col
- announcements.push(`<div class="card color ` + col + `">
-` + jQuery(jQuery(ann[i]).children("td")[1]).children(".annc-with-images").html() + `
+ var subject = "";
+ if (psClass !== -1) {
+ col = dtps.classes[psClass].col
+ subject = `<div class="label">` + dtps.classes[psClass].subject + `</div>`;
+ }
+ announcements.push(`<div onclick="$(this).toggleClass('open');" style="margin: 25px; margin-right: 0px; width: 100%;cursor: pointer;" class="announcement card color ` + col + `">
+` + subject + jQuery(jQuery(ann[i]).children("td")[1]).children(".annc-with-images").html() + `
</div>
`);
}
}
- if (dtps.selectedClass == "announcements") {
- jQuery(".classContent").html(announcements.join("")); }
+ if ((dtps.selectedClass == "dash") && (dtps.masterContent == "assignments")) {
+ jQuery(".dash.cal").append("<br />" + announcements.join("")); }
});
};
dtps.calendar = function(doneLoading) {
- if ((dtps.selectedClass == "stream") && (dtps.masterContent == "cal")) {
- var loadingDom = "";
- if (!doneLoading) {
- loadingDom = `<div class="spinner">
- <div class="bounce1"></div>
- <div class="bounce2"></div>
- <div class="bounce3"></div>
- </div>`;
- }
- $(".classContent").html(loadingDom + `<div id='calendar' class="card"></div>`)
+ if ((dtps.selectedClass == "dash") && (dtps.masterContent == "assignments")) {
calEvents = [];
for (var i = 0; i < dtps.classes.length; i++) {
if (dtps.classes[i].stream) {
dtps.log("BUILDING CAL: " + i)
for (var ii = 0; ii < dtps.classes[i].stream.length; ii++) {
if (dtps.classes[i].stream[ii].dueDate) {
+ var styles = window.getComputedStyle($(".class." + i)[0]);
calEvents.push({
title: dtps.classes[i].stream[ii].title,
start: dtps.classes[i].stream[ii].dueDate,
allDay: false,
- color: $(".class." + i).css("background-color"),
+ color: styles.getPropertyValue('--norm'),
classNum: i,
streamNum: ii
})
@@ -632,7 +776,7 @@
events: calEvents,
header: {
left: 'title',
- right: 'prev,next today month,agendaWeek,agendaDay'
+ right: 'prev,next'
},
eventClick: function(calEvent, jsEvent, view) {
dtps.assignment(calEvent.classNum, calEvent.streamNum);
@@ -640,35 +784,63 @@
});
}
}
-dtps.showClasses = function() {
+dtps.clearData = function() {
+if (window.confirm("Clearing Power+ data will clear all local user data stored by Power+. This should be done if it is a new semester / school year or if you are having issues with Power+. Are you sure you want to clear all your Power+ data?")) {
+ window.localStorage.clear()
+ window.alert("Power+ data cleared. Reload the page to begin repopulating your userdata.")
+}
+}
+dtps.showClasses = function(override) {
var streamClass = "active"
- if (dtps.selectedClass !== "stream") var streamClass = "";
+ if (dtps.selectedClass !== "dash") var streamClass = "";
dtps.classlist = [];
var unreadAnn = "";
if (dtps.unreadAnn) unreadAnn = " &nsbp;(" + dtps.unreadAnn + ")";
+ if (window.localStorage.dtpsClassOrder !== undefined) {
+ var classOrder = JSON.parse(window.localStorage.dtpsClassOrder)
+ for (var i = 0; i < classOrder.length; i++) {
+ var num = 0;
+ for (var ii = 0; ii < dtps.classes.length; ii++) {
+ if (dtps.classes[ii].id == classOrder[i]) { var num = ii; }
+ }
+ var googleDom = "";
+ if (dtps.classes[num].google) var googleDom = " google_G";
+ dtps.classlist.push(`
+ <div onclick="dtps.selectedClass = ` + num + `" class="class ` + num + ` ` + dtps.classes[num].col + `">
+ <div class="name">` + dtps.classes[num].subject + googleDom + `</div>
+ <div class="grade val"><span class="letter">` + dtps.classes[num].letter + `</span><span class="points">` + dtps.classes[num].grade + `%</span></div>
+ </div>
+ `);
+ }
+ } else {
for (var i = 0; i < dtps.classes.length; i++) {
+ var googleDom = "";
+ if (dtps.classes[i].google) var googleDom = " google_G";
dtps.classlist.push(`
<div onclick="dtps.selectedClass = ` + i + `" class="class ` + i + ` ` + dtps.classes[i].col + `">
- <div class="name">` + dtps.classes[i].subject + `</div>
+ <div class="name">` + dtps.classes[i].subject + googleDom + `</div>
<div class="grade val"><span class="letter">` + dtps.classes[i].letter + `</span><span class="points">` + dtps.classes[i].grade + `%</span></div>
</div>
`);
}
- if (!Boolean(jQuery(".sidebar .class.masterStream")[0])) {
- jQuery(".sidebar").html(`<div onclick="dtps.selectedClass = 'stream';" class="class masterStream ` + streamClass + `">
- <div class="name">Stream</div>
- <div class="grade"><i class="material-icons">view_stream</i></div>
+ }
+ if ((!Boolean(jQuery(".sidebar .class.masterStream")[0])) || override) {
+ jQuery(".sidebar").html(`<h5 style="margin: 10px 0px 25px 0px; font-weight: 600; font-size: 27px; text-align: center;">Power+</h5>
+<div onclick="dtps.selectedClass = 'dash';" class="class masterStream ` + streamClass + `">
+ <div class="name">Dashboard</div>
+ <div class="grade"><i class="material-icons">dashboard</i></div>
</div>
- <div onclick="dtps.selectedClass = 'announcements';" class="class">
+ <div style="display: none;" onclick="dtps.selectedClass = 'announcements';" class="class">
<div class="name" id="annLabel">Announcements ` + unreadAnn + `</div>
<div class="grade"><i class="material-icons">announcement</i></div>
</div>
<div class="classDivider"></div>
` + dtps.classlist.join(""));
- if (dtps.selectedClass !== "stream") $(".class." + dtps.selectedClass).addClass("active");
+ if (dtps.selectedClass !== "dash") $(".class." + dtps.selectedClass).addClass("active");
if ($(".btn.pages").hasClass("active")) { $(".btn.pages").removeClass("active"); $(".btn.stream").addClass("active"); dtps.classStream(dtps.selectedClass); dtps.selectedContent = "stream"; }
- $( ".class" ).click(function(event) {
+ $( ".class:not(.google)" ).click(function(event) {
var prev = window.getComputedStyle(document.getElementsByClassName("background")[0]).getPropertyValue("--grad")
+ $(".btn.google").hide();
$(".background").css("background", prev)
$(".background").addClass("trans");
clearTimeout(dtps.bgTimeout);
@@ -680,41 +852,180 @@
$(".background").removeClass(jQuery.grep($(".background").attr("class").split(" "), function (item, index) {
return item.trim().match(/^filter_/);
})[0]);
- if (dtps.classes[dtps.selectedClass]) $(".background").addClass(dtps.classes[dtps.selectedClass].col)
+ $(".header").removeClass(jQuery.grep($(".header").attr("class").split(" "), function (item, index) {
+ return item.trim().match(/^filter_/);
+ })[0]);
+ if (dtps.classes[dtps.selectedClass]) { if (dtps.classes[dtps.selectedClass].google) { $(".btn.google").show(); }; $(".background").addClass(dtps.classes[dtps.selectedClass].col); $(".header").addClass(dtps.classes[dtps.selectedClass].col) }
$(this).siblings().removeClass("active")
$(this).addClass("active")
$(".header h1").html($(this).children(".name").text())
if (!dtps.classes[dtps.selectedClass]) {
$(".header .btns").hide();
- if (dtps.selectedClass == "stream") $(".header .btns.master").show();
} else {
$(".header .btns:not(.master)").show();
- $(".header .btns.master").hide();
}
if ((dtps.selectedContent == "stream") && (dtps.classes[dtps.selectedClass])) dtps.classStream(dtps.selectedClass)
if ((dtps.selectedContent == "grades") && (dtps.classes[dtps.selectedClass])) dtps.gradebook(dtps.selectedClass)
- if (dtps.selectedClass == "stream") dtps.masterStream(true);
+ if (dtps.selectedClass == "dash") dtps.masterStream(true);
if (dtps.selectedClass == "announcements") dtps.announcements();
if (dtps.classes[dtps.selectedClass]) { if (dtps.classes[dtps.selectedClass].weights) { if (dtps.classes[dtps.selectedClass].weights.length) { $(".btns .btn.grades").show(); } else { $(".btns .btn.grades").hide(); } } else { $(".btns .btn.grades").hide(); } }
});
}
}
+dtps.saveClassOrder = function() {
+$(".sidebar").sortable("destroy");
+var classes = $(".sidebar").children(".class")
+var classOrder = [];
+for (var i = 0; i < classes.length; i++) {
+if (/\d/.test(jQuery(classes[i]).attr("class"))) {
+classOrder.push(dtps.classes[Number(jQuery(classes[i]).attr("class").replace(/^\D+|\D.*$/g, ""))].id)
+}
+}
+localStorage.setItem("dtpsClassOrder", JSON.stringify(classOrder));
+dtps.sorting = false;
+window.alert("Class order saved");
+}
+dtps.googleStream = function() {
+ function googleStream(i) {
+ if (dtps.classes[i].google) {
+ jQuery.getJSON("https://classroom.googleapis.com/v1/courses/" + dtps.classes[i].google.id + "/courseWork" + dtps.classroomAuth, function(resp) {
+ dtps.classes[i].google.rawData = resp;
+ dtps.classes[i].google.stream = [];
+ for (var ii = 0; ii < resp.courseWork.length; ii++) {
+ if (resp.courseWork[ii].dueDate) {
+ var due = new Date(resp.courseWork[ii].dueDate.year, resp.courseWork[ii].dueDate.month - 1, resp.courseWork[ii].dueDate.day - 1);
+ } else {
+ var due = new Date();
+ }
+ dtps.classes[i].google.stream.push({
+ title: resp.courseWork[ii].title,
+ due: due.toHumanString(),
+ dueDate: due.toISOString(),
+ class: i,
+ subject: dtps.classes[i].subject,
+ turnedIn: false,
+ google: true,
+ url: resp.courseWork[ii].alternateLink,
+ letter: "--",
+ grade: "--/" + resp.courseWork[ii].maxPoints
+ })
+ }
+ if (i < (dtps.classes.length - 1)) googleStream(i + 1);
+ });
+ } else {
+ if (i < (dtps.classes.length - 1)) googleStream(i + 1);
+ }
+ }
+ googleStream(0);
+}
+dtps.googleAuth = function() {
+ window.alert("EXPERIMENTAL FEATURE\n Your name and email will be logged in the Power+ database if you continute. Do not send feedback or bug reports about this feature yet.")
+ firebase.auth().signInWithPopup(dtps.authProvider).then(function(result) {
+ var token = result.credential.accessToken;
+ dtps.user.google = result.user;
+ $(".items img").attr("src", dtps.user.google.photoURL)
+ $(".items img").show();
+ dtps.classroomAuth = "?access_token=" + token;
+ console.log(result);
+ jQuery.getJSON("https://classroom.googleapis.com/v1/courses" + dtps.classroomAuth, function(resp) {
+ dtps.googleClasses = resp.courses;
+ function editDistance(s1, s2) {
+ s1 = s1.toLowerCase();
+ s2 = s2.toLowerCase();
+
+ var costs = new Array();
+ for (var i = 0; i <= s1.length; i++) {
+ var lastValue = i;
+ for (var j = 0; j <= s2.length; j++) {
+ if (i == 0)
+ costs[j] = j;
+ else {
+ if (j > 0) {
+ var newValue = costs[j - 1];
+ if (s1.charAt(i - 1) != s2.charAt(j - 1))
+ newValue = Math.min(Math.min(newValue, lastValue),
+ costs[j]) + 1;
+ costs[j - 1] = lastValue;
+ lastValue = newValue;
+ }
+ }
+ }
+ if (i > 0)
+ costs[s2.length] = lastValue;
+ }
+ return costs[s2.length];
+ }
+ function similarity(s1, s2) {
+ var longer = s1;
+ var shorter = s2;
+ if (s1.length < s2.length) {
+ longer = s2;
+ shorter = s1;
+ }
+ var longerLength = longer.length;
+ if (longerLength == 0) {
+ return 1.0;
+ }
+ return (longerLength - editDistance(longer, shorter)) / parseFloat(longerLength);
+ }
+ for (var i = 0; i < dtps.googleClasses.length; i++) {
+ var highest = {stat: 0, class: null};
+ for (var ii = 0; ii < dtps.classes.length; ii++) {
+ var stat = similarity(dtps.googleClasses[i].name, dtps.classes[ii].subject)
+ if ((stat > highest.stat) && (stat > 0.2)) highest = {stat: stat, class: ii}
+ }
+ if (highest.class !== null) {
+ dtps.classes[highest.class].google = dtps.googleClasses[i]
+ }
+ }
+ dtps.showClasses(true);
+ dtps.googleStream();
+ });
+})
+}
+dtps.logGrades = function() {
+ if ((window.localStorage.dtpsGradeTrend !== "false") && (window.localStorage.dtpsGradeTrend !== undefined)) {
+ dtps.log("Grade trend enabled; checking grade data")
+ var now = new Date();
+ var start = new Date(now.getFullYear(), 0, 0);
+ var diff = (now - start) + ((start.getTimezoneOffset() - now.getTimezoneOffset()) * 60 * 1000);
+ var oneDay = 1000 * 60 * 60 * 24;
+ var day = Math.floor(diff / oneDay);
+ var gradeData = JSON.parse(window.localStorage.dtpsGradeTrend);
+ if (!gradeData.day) {
+ dtps.log("Grade trend enabled; check passed; storing grades for today")
+ var gradesNow = {};
+ for (var i = 0; i < dtps.classes.length; i++) {
+ gradesNow[dtps.classes[i].id] = dtps.classes[i].grade
+ }
+ gradeData[day] = gradesNow;
+ localStorage.setItem('dtpsGradeTrend', JSON.stringify(gradeData));
+ }
+ }
+}
dtps.render = function() {
document.title = "Power+" + dtps.trackSuffix
$ = jQuery;
- if (!dtps.showChangelog){ fluidThemes = [ "midnight", "nitro", "aquatic", "rainbow" ]; jQuery.getScript('https://dtps.js.org/fluid.js'); }
- dtps.selectedClass = "stream";
+ var letterGradesClass = "";
+ if (window.localStorage.dtpsLetterGrades == "true") { $("body").addClass("letterGrades"); letterGradesClass = " active"; }
+ if (!dtps.showChangelog) jQuery.getScript('https://dtps.js.org/fluid.js');
+ dtps.selectedClass = "dash";
+ dtps.sorting = false;
dtps.selectedContent = "stream";
- dtps.masterContent = "list";
- var compactActive = "";
- if (window.localStorage.dtpsCompact == "true") { jQuery("body").addClass("compact"); compactActive = " active" }
- var relDom = "";
+ dtps.masterContent = "assignments";
+ var trackDom = "";
if (dtps.trackSuffix !== "") {
- relDom = dtps.readableVer.replace(dtps.trackSuffix, `<div style="display:inline-block;" class="beta badge notice">` + dtps.trackSuffix.replace(" (", "").replace(")", "") + `</div>`);
+ trackDom = `<div style="display:inline-block;font-size: 16px; padding: 3px 4px;" class="beta badge notice">` + dtps.trackSuffix.replace(" (", "").replace(")", "") + `</div>`
} else {
- relDom = dtps.readableVer;
+ trackDom = ``;
}
- document.addEventListener('extensionData', function(e) {
+ var verDom = dtps.readableVer.replace(dtps.trackSuffix, "");
+ if (dtps.trackSuffix !== "") {
+ verDom = `<div class="buildInfo" style="display: inline-block;font-size: 12px;cursor: pointer;"></div>`
+ } else {
+ verDom = dtps.readableVer.replace(dtps.trackSuffix, "");
+ }
+ document.addEventListener('extensionData', function(e) {
if (e.detail == "extensionInstalled") {
var extensionDom = "";
jQuery(".extensionDom").html(`<br />
@@ -723,6 +1034,7 @@
<br /><br />
<div class="extensionDevMode switch" id="extensionDevMode" onclick="$(this).toggleClass('active'); if (window.localStorage.devAutoLoad == 'true') {localStorage.setItem('devAutoLoad', false);} else {localStorage.setItem('devAutoLoad', true);}"><span class="head"></span></div>
<div class="extensionDevMode label"><i class="material-icons">extension</i> Load the dev (unstable) version of Power+</div>`)
+ jQuery(".extTab").show();
if (window.localStorage.disableAutoLoad == "true") { jQuery("#extensionAutoLoad").removeClass("active"); jQuery(".extensionDevMode").hide(); }
if (window.localStorage.devAutoLoad == "true") { jQuery("#extensionDevMode").addClass("active"); }
}
@@ -732,71 +1044,176 @@
</div>
<div class="background trans"></div>
<div class="header">
- <h1 id="headText">Stream</h1>
- <div style="display: none;" class="btns row">
+ <h1 id="headText">Dashboard</h1>
+ <div style="display: none;" class="btns row tabs">
<button onclick="dtps.selectedContent = 'stream'; dtps.classStream(dtps.selectedClass);" class="btn active stream">
- <i class="material-icons">view_stream</i>
- Stream
+ <i class="material-icons">assignment</i>
+ Assignments
+ </button>
+ <button onclick="dtps.selectedContent = 'google'; $('.classContent').html(dtps.renderStream(dtps.classes[dtps.selectedClass].google.stream))" class="btn google">
+ <i class="material-icons">experiment</i>
+ google_logo Classroom
</button>
<button onclick="dtps.selectedContent = 'pages'; dtps.loadPages(dtps.selectedClass);" class="btn pages">
<i class="material-icons">list</i>
Pages
</button>
<button onclick="dtps.selectedContent = 'grades'; dtps.gradebook(dtps.selectedClass);" class="btn grades">
- <i class="material-icons">book</i>
- Gradebook
+ <i class="material-icons">assessment</i>
+ Grades
+ </button>
+ <button onclick="alert('The grade editor is just for fun. Does not change your actual grade. For Power+ testers only. Do not abuse this.'); dtps.classes[dtps.selectedClass].letter = prompt('Enter a letter grade'); dtps.classes[dtps.selectedClass].grade = prompt('Enter a percentage number(i.e. 98)');dtps.showClasses(true);" class="btn sudo gradeEditor" style="display: none;">
+ <i class="material-icons">edit</i>
+ Grade Editor
</button>
</div>
-<div class="btns row master">
- <button onclick="dtps.masterContent = 'list'; dtps.masterStream(true);" class="btn stream active">
- <i class="material-icons">view_stream</i>
- List
- </button>
- <button onclick="dtps.masterContent = 'cal'; dtps.masterStream(true);" class="btn cal">
- <i class="material-icons">calendar_today</i>
- Calendar
- </button>
</div>
- <div class="classContent">
+ <div class="classContent">
<div class="spinner">
<div class="bounce1"></div>
<div class="bounce2"></div>
<div class="bounce3"></div>
</div>
</div>
- </div>
<div style="width: calc(80%);border-radius: 30px;" class="card focus close abt">
<i onclick="fluid.cards.close('.card.abt')" class="material-icons close">close</i>
- <h3>About</h3>
- <h5>Power+ ` + relDom + `</h5>
+<img src="https://dtps.js.org/dtps.png" style="vertical-align: middle;width: 100px;margin-right: 10px;">
+ <div style="display:inline-block; vertical-align: middle;">
+ <h4 style="margin: 0px">Power+ ` + trackDom + `</h4>
+ <h5 style="display: inline-block; margin: 0px; margin-top: 5px; font-size: 1.5rem;">` + dtps.readableVer.replace(dtps.trackSuffix, "") + `<div class="buildInfo" style="display: inline-block;margin: 0px 5px;font-size: 12px;cursor: pointer;"></div></h5>
+</div>
+<br /><br />
Logged in as ` + dtps.user.first_name + ` ` + dtps.user.last_name + ` (` + dtps.user.login + `)
<div style="display:inline-block;" class="beta badge notice sudo">tester <i style="vertical-align: middle;" class="material-icons sudo">experiment</i></div>
<div style="display:inline-block;" class="beta badge notice contributor">contributor <i style="vertical-align: middle;" class="material-icons contributor">group</i></div>
<div style="display:inline-block;" class="beta badge notice og">OG <i style="vertical-align: middle;" class="material-icons og">star</i></div>
<div style="display:inline-block;" class="beta badge notice dev">developer <i style="vertical-align: middle;" class="material-icons dev">code</i></div>
<p>Made by <a href="https://github.com/jottocraft">jottocraft</a></p>
- <br />
<div class="btns row themeSelector"></div>
<br /><br />
<div onclick="jQuery('body').toggleClass('hidegrades')" class="switch"><span class="head"></span></div>
<div class="label"><i class="material-icons">visibility_off</i> Hide class grades</div>
<br /><br />
-<div onclick="jQuery('body').toggleClass('compact'); if (jQuery('body').hasClass('compact')) { localStorage.setItem('dtpsCompact', true); } else { localStorage.setItem('dtpsCompact', false); }" class="switch` + compactActive + `"><span class="head"></span></div>
- <div class="label"><i class="material-icons">view_compact</i> Compact class view</div>
- <br /><br />
-<div onclick="if (dtps.showLetters) {dtps.showLetters = false;} else {dtps.showLetters = true;}" class="switch sudo"><span class="head"></span></div>
- <div class="label sudo"><i class="material-icons">experiment</i> Show letter grades instead of points earned</div>
+<div onclick="$('body').toggleClass('letterGrades'); localStorage.setItem('dtpsLetterGrades', $('body').hasClass('letterGrades'));" class="switch` + letterGradesClass + `"><span class="head"></span></div>
+ <div class="label"><i class="material-icons">font_download</i> Display letter grades instead of points earned</div>
+<br /><br />
+<div onclick="$('.gradeEditor').toggle();" class="switch sudo"><span class="head"></span></div>
+ <div class="label sudo"><i class="material-icons">edit</i> Show grade editor</div>
<div class="extensionDom" ></div>
<br /><br />
<button onclick="dtps.changelog();" style="display:none;" class="btn changelog"><i class="material-icons">update</i>Changelog</button>
-<button id="signout_button" style="display:none;" class="btn sudo"><i class="material-icons">experiment</i>google_logo Signout</button>
- <button id="authorize_button" style="display:none;" class="btn sudo"><i class="material-icons">experiment</i>Link google_logo Classroom</button>
+ <button onclick="if (!dtps.sorting) { dtps.sorting = true; $('.sidebar').sortable(); window.alert('Drag and drop to reorder your classes. Click this button again when you are done.') } else { dtps.saveClassOrder(); }" class="btn"><i class="material-icons">list</i>Sort classes</button>
+ <button onclick="dtps.googleAuth();" class="btn sudo"><i class="material-icons">experiment</i>Link google_logo</button>
+ <button onclick="dtps.clearData();" class="btn"><i class="material-icons">delete_outline</i>Reset Power+</button>
</div>
+<div style="height: calc(100vh - 50px);width: 75%;" class="card withnav focus close abt-new">
+<i onclick="fluid.cards.close('.card.abt-new')" class="material-icons close">close</i>
+ <div class="sidenav">
+ <div class="title">
+ <img src="https://dtps.js.org/outline.png" style="width: 50px;vertical-align: middle;margin-right: 5px;padding: 7px; padding-top: 14px;" />
+ <div style="vertical-align: middle; display: inline-block;">
+ <h5 style="font-weight: bold;display: inline-block;vertical-align: middle;">Power+</h5>` + trackDom + `
+ <p style="font-weight: bold;">` + verDom + `</p>
+ </div>
+ </div>
+ <div onclick="$('.abtpage').hide();$('.abtpage.display').show();" class="item active">
+ <i class="material-icons">aspect_ratio</i> Display
+ </div>
+ <div onclick="$('.abtpage').hide();$('.abtpage.classes').show();" class="item">
+ <i class="material-icons">book</i> Classes
+ </div>
+ <div style="display:none;" onclick="$('.abtpage').hide();$('.abtpage.extension').show();" class="item extTab">
+ <i class="material-icons">extension</i> Extension
+ </div>
+ <div onclick="$('.abtpage').hide();$('.abtpage.experiments').show();" class="item sudo">
+ <i class="material-icons">experiment</i> Experiments
+ </div>
+ <div onclick="$('.abtpage').hide();$('.abtpage.debug').show();" class="item dev">
+ <i class="material-icons">bug_report</i> Debugging
+ </div>
+ <div onclick="$('.abtpage').hide();$('.abtpage.about').show();" class="item">
+ <i class="material-icons">info</i> About
+ </div>
+ </div>
+ <div class="content">
+<div class="abtpage display">
+ <h5>Display</h5>
+ <br />
+ <p><b>Theme</b></p>
+ <div class="btns row themeSelector"></div>
+ <br /><br />
+ <p><b>Grades</b></p>
+ <div onclick="jQuery('body').toggleClass('hidegrades')" class="switch"><span class="head"></span></div>
+ <div class="label"><i class="material-icons">visibility_off</i> Hide class grades</div>
+ <br /><br />
+ <div onclick="$('body').toggleClass('letterGrades'); localStorage.setItem('dtpsLetterGrades', $('body').hasClass('letterGrades'));" class="switch` + letterGradesClass + `"><span class="head"></span></div>
+ <div class="label"><i class="material-icons">font_download</i> Display letter grades instead of points earned</div>
+ <br /><br />
+ <div onclick="$('.gradeEditor').toggle();" class="switch sudo"><span class="head"></span></div>
+ <div class="label sudo"><i class="material-icons">edit</i> Show grade editor (Power+ testers only)</div>
+</div>
+<div style="display: none;" class="abtpage classes">
+ <h5>Classes</h5>
+ <button onclick="if (!dtps.sorting) { dtps.sorting = true; $('.sidebar').sortable(); window.alert('Drag and drop to reorder your classes. Click this button again when you are done.') } else { dtps.saveClassOrder(); }" class="btn"><i class="material-icons">list</i>Sort classes</button>
+ <br /><br />
+ <h5>Google Classes</h5>
+ <p>Classes listed below could not be associated with a PowerSchool class. You can choose which classes to show in the sidebar.</p>
+ <div class="otherGClasses"><p>Coming soon!</p></div>
+</div>
+<div style="display: none;" class="abtpage extension">
+ <h5>Extension</h5>
+ <div class="extensionDom" ></div>
+</div>
+<div style="display: none;" class="abtpage experiments">
+<div class="sudo">
+ <h5>Experiments</h5>
+ <p>Features listed below are in development or are UI tests and cannot be included in a bug report until their stable releases</p>
+ <p>Want to test out new features as they are developed instead of waiting for the next release? <a href="https://dtps.js.org/devbookmark.txt">Try the dev version of Power+</a>.</p>
+ <br />
+ <button onclick="dtps.googleAuth();" class="btn sudo"><i class="material-icons">experiment</i>Link google_logo Classroom</button>
+</div>
+</div>
+<div style="display: none;" class="abtpage debug">
+<div class="dev">
+ <h5>Debugging</h5>
+</div>
+</div>
+<div style="display: none;" class="abtpage about">
+ <h5>Power+ ` + dtps.readableVer + ` <div class="buildInfo" style="display: inline-block;margin: 0px 5px;font-size: 12px;cursor: pointer;"></div></h5>
+ <p>Made by <a href="https://github.com/jottocraft">jottocraft</a></p>
+<div style="display:inline-block;" class="beta badge notice sudo">tester <i style="vertical-align: middle;" class="material-icons sudo">experiment</i></div>
+<div style="display:inline-block;" class="beta badge notice contributor">contributor <i style="vertical-align: middle;" class="material-icons contributor">group</i></div>
+<div style="display:inline-block;" class="beta badge notice og">OG <i style="vertical-align: middle;" class="material-icons og">star</i></div>
+<div style="display:inline-block;" class="beta badge notice dev">developer <i style="vertical-align: middle;" class="material-icons dev">code</i></div>
+<br /><br />
+ <button onclick="dtps.changelog();" style="display:none;" class="btn changelog"><i class="material-icons">update</i>Changelog</button>
+ <button onclick="dtps.clearData();" class="btn"><i class="material-icons">delete_outline</i>Reset Power+</button>
+ <br /><br />
+ <h5>Resources</h5>
+ <ul>
+<li><a href="mailto:***REMOVED***">Contact me</a></li>
+<li><a href="https://dtps.js.org">Power+ website</a></li>
+<li><a href="https://github.com/jottocraft/dtps">Source code on GitHub</a> (<a href="https://github.com/jottocraft/dtps/blob/master/LICENSE">license</a>)</li>
+</ul>
+ <br />
+ <h5>Credits</h5>
+<ul>
+ <li>Calendar made with <a href="https://fullcalendar.io/">FullCalendar</a></li>
+ <li>Grade trend graphs made with <a href="https://www.chartjs.org/">Chart.js</a></li>
+ <li>Logo made with logomakr.com</li>
+</ul>
+<br />
+<p>(c) 2018-2019 jottocraft (<a href="https://github.com/jottocraft/dtps/blob/master/LICENSE">license</a>)</p>
+</div>
+ </div>
+</div>
<div class="items">
<h4>` + dtps.user.first_name + ` ` + dtps.user.last_name + `</h4>
- <i onclick="document.dispatchEvent(new CustomEvent('extensionData', { detail: 'extensionStatus'})); fluid.modal('.abt');" class="material-icons">info_outline</i>
- <i onclick="fluid.modal('.console')" class="material-icons dev">code</i>
+ <img src="` + dtps.user.prof + `" style="width: 50px; height: 50px; margin: 0px 5px; border-radius: 50%; vertical-align: middle;" />
<i onclick="window.open('https://github.com/jottocraft/dtps/issues/new/choose')" class="material-icons">feedback</i>
+ <i onclick="fluid.modal('.console')" class="material-icons dev">code</i>
+ <i onclick="document.dispatchEvent(new CustomEvent('extensionData', { detail: 'extensionStatus'})); fluid.modal('.abt-new')" class="material-icons sudo">experiment</i>
+ <i onclick="document.dispatchEvent(new CustomEvent('extensionData', { detail: 'extensionStatus'})); fluid.modal('.abt')" class="material-icons">more_horiz</i>
</div>
<div style="width: calc(80%);border-radius: 30px;" class="card focus changelog close">
<i onclick="fluid.cards.close('.card.changelog')" class="material-icons close">close</i>
@@ -818,7 +1235,23 @@
<i onclick="fluid.cards.close('.card.details')" class="material-icons close">close</i>
<p>An error occured</p>
</div>
+<div style="width: calc(80%);border-radius: 30px;" class="card focus trend close">
+<i onclick="fluid.cards.close('.card.trend')" class="material-icons close">close</i>
+<h3>Grade Trend</h3>
+<p>Grade trend lets you keep track of your grades over time. When you enable grade trend, Power+ will store a copy of your class grades locally on your computer every day you use Power+. Then, when you click on the grades tab with grade trend enabled, Power+ will show you a graph of how your class grades have changed over time.</p>
+<p>The grade trend setting applies to all classes. It may take a few days after enabling grade trend for the graph to appear.</p>
+<p><b>You can always disable grade trend by clicking the turn off button on the grade trend graph. Disabling grade trend permanently erases all of your grade data off of your computer.</b></p>
+<button onclick="localStorage.setItem('dtpsGradeTrend', JSON.stringify({})); window.alert('Grade trend enabled'); dtps.logGrades();" class="btn"><i class="material-icons">timeline</i> Enable grade trend</button><button onclick="fluid.cards.close('.card.trend')" class="btn"><i class="material-icons">cancel</i> Not now</button>
+</div>
`);
+ var getURL = "https://api.github.com/repos/jottocraft/dtps/commits?path=init.js";
+ if (dtps.trackSuffix !== "") var getURL = "https://api.github.com/repos/jottocraft/dtps/commits?path=dev.js";
+ jQuery.getJSON(getURL, function(data) {
+ jQuery(".buildInfo").html("build " + data[0].sha.substring(7,0));
+ jQuery(".buildInfo").click(function() {
+ window.open("https://github.com/jottocraft/dtps/commit/" + data[0].sha)
+ });
+ })
jQuery.getScript("https://cdn.rawgit.com/showdownjs/showdown/1.8.6/dist/showdown.min.js", function() {
markdown = new showdown.Converter();
jQuery.getJSON("https://api.github.com/repos/jottocraft/dtps/releases", function(data) {
@@ -854,13 +1287,16 @@
jQuery("<link/>", {
rel: "stylesheet",
type: "text/css",
- href: "https://dtps.js.org/dtps.css"
+ href: "https://dtps.js.org/dev.css"
}).appendTo("head");
jQuery("<link/>", {
rel: "stylesheet",
type: "text/css",
href: "https://fonts.googleapis.com/icon?family=Material+Icons+Extended"
}).appendTo("head");
+ jQuery('.classContent').bind('heightChange', function(){
+ jQuery(".sidebar").css("height", Number(jQuery(".classContent").css("height").slice(0,-2)))
+ });
fluid.init();
}
dtps.init();