updated gradebook (fluid v5)
diff --git a/dtps.css b/dtps.css
index cfd2ca4..9f42534 100644
--- a/dtps.css
+++ b/dtps.css
@@ -1446,4 +1446,34 @@
#headText {
transition: color 0.2s;
+}
+
+.gradeSummaryShowHide {
+ margin: 10px 0px;
+ cursor: pointer;
+ text-align: center;
+}
+
+.gradeSummaryShowHide i, .gradeSummaryShowHide span {
+ vertical-align: middle;
+}
+
+.gradeSummaryShowHide i {
+ margin-right: 5px;
+}
+
+#classGradeMore {
+ margin: 0px 20px;
+ padding: 20px;
+}
+
+.block.status .bottom {
+ font-size: 18px;
+}
+
+.block .previousGrade {
+ font-size: 14px;
+ opacity: 0.5;
+ position: absolute;
+ top: 50px;
}
\ No newline at end of file
diff --git a/scripts/assignments.js b/scripts/assignments.js
index 15badda..07a9f7d 100644
--- a/scripts/assignments.js
+++ b/scripts/assignments.js
@@ -385,19 +385,21 @@
if (!assignments) {
//Assignments are still loading
if ((dtps.selectedClass == classNum) && (dtps.selectedContent == "stream")) {
- jQuery(".classContent").html(/*html*/`
- <div class="card assignment graded">
- <h4>
- <span style="width: 450px;" class="shimmer">Assignment Title</span>
- <div class="points shimmer">0/0</div>
- </h4>
+ jQuery(".classContent").html([1,2,3,4].map(() => (
+ /*html*/`
+ <div class="card assignment graded">
+ <h4>
+ <span style="width: 450px;" class="shimmer">Assignment Title</span>
+ <div class="points shimmer">00/00</div>
+ </h4>
- <h5 style="white-space: nowrap; overflow: hidden;">
- <div style="width: 200px;" class="infoChip shimmer"></div>
- <i class="material-icons statusIcon shimmer">more_horiz</i>
- </h5>
- </div>
- `);
+ <h5 style="white-space: nowrap; overflow: hidden;">
+ <div style="width: 200px;" class="infoChip shimmer"></div>
+ <i class="material-icons statusIcon shimmer">more_horiz</i>
+ </h5>
+ </div>
+ `
+ )).join(""));
}
} else if (assignments.length == 0) {
if (searchText) {
diff --git a/scripts/lms/dtech.js b/scripts/lms/dtech.js
index f2e4e6c..2edb6c6 100644
--- a/scripts/lms/dtech.js
+++ b/scripts/lms/dtech.js
@@ -417,47 +417,24 @@
//RENDERER: RENDER GRADE CALCULATION SUMMARY ------------------------------------
if (course.gradeCalculation.dtech.formula == "2020s1") {
var gradeCalcSummary = /*html*/`
- <div style="--classColor: ${course.color}" class="card">
+ <div style="--size: 250px; margin: 0px 20px;" class="grid flex">
+ <div style="background-color: ${course.color}; color: white;" class="block status card">
+ <h2 class="main">${course.letter}</h2>
+ ${course.previousLetter ? `<h5 class="previousGrade">Previous grade: ${course.previousLetter}</h5>` : ""}
+ <h5 class="bottom"><i class="material-icons">grade</i> Grade</h5>
+ </div>
+ <div class="block status">
+ <h2 class="main numFont">${course.gradeCalculation.dtech.results.parameters.number75.toFixed(2)}</h2>
+ <h5 class="bottom"><i class="material-icons">functions</i> 75% of outcomes (${course.gradeCalculation.dtech.results.parameters.number75thresh}) ≥</h5>
+ </div>
+ <div class="block status">
+ <h2 class="main numFont">${course.gradeCalculation.dtech.results.parameters.lowestScore.toFixed(2)}</h2>
+ <h5 class="bottom"><i class="material-icons">leaderboard</i> Lowest outcome</h5>
+ </div>
+ </div>
- <h3 class="gradeTitle">
- Grades
-
- <div class="classGradeCircle">
- <div class="letter">${course.letter}</div>
- </div>
-
- </h3>
-
- <h5 class="gradeStat">
- 75% (rounded down) of outcome scores are ≥
- <div class="numFont">${course.gradeCalculation.dtech.results.parameters.number75.toFixed(1)}</div>
- </h5>
-
- <h5 class="gradeStat">
- No outcome scores are lower than
- <div class="numFont">${course.gradeCalculation.dtech.results.parameters.lowestScore.toFixed(1)}</div>
- </h5>
-
- <div style="${dtps.gradebookExpanded ? "" : "display: none;"}" id="classGradeMore">
- <br />
-
- ${course.previousLetter ? /*html*/`
- <h5 class="smallStat">
- Previous Grade
- <div class="numFont">${course.previousLetter}</div>
- </h5>
- ` : ``}
-
- ${course.gradeCalculation.dtech.results.parameters.number75thresh ? /*html*/`
- <h5 class="smallStat">
- 75% of outcomes (rounded down) is
- <div class="numFont">${course.gradeCalculation.dtech.results.parameters.number75thresh}</div>
- </h5>
- ` : ``}
-
- <br />
-
- <table class="u-full-width dtpsTable">
+ <div style="--classColor: ${course.color};${dtps.gradebookExpanded ? "" : "display: none;"}" id="classGradeMore">
+ <table class="table dtpsTable">
<thead>
<tr>
<th> Final Letter</th>
@@ -480,12 +457,8 @@
</table>
</div>
- <br />
-
- <br />
- <a onclick="$('#classGradeMore').toggle(); if ($('#classGradeMore').is(':visible')) {$(this).html('Show less'); dtps.gradebookExpanded = true;} else {$(this).html('Show more'); dtps.gradebookExpanded = false;}"
- style="color: var(--secText, gray); cursor: pointer; margin-right: 10px;">${dtps.gradebookExpanded ? "Show less" : "Show more"}</a>
- <a href="https://docs.google.com/document/d/1g4-aYZ_BS5_I4Ie64WGCwXeArl1K_pHbBbebDHra_sM/edit" style="color: var(--secText, gray);">Using 2020-21 grade calculation</a>
+ <div onclick="$('#classGradeMore').toggle(); if ($('#classGradeMore').is(':visible')) {$(this).children('i').text('keyboard_arrow_up'); $(this).children('span').text('Show less'); dtps.gradebookExpanded = true;} else {$(this).children('i').text('keyboard_arrow_down'); $(this).children('span').text('Show more'); dtps.gradebookExpanded = false;}" class="gradeSummaryShowHide">
+ ${dtps.gradebookExpanded ? `<i class="material-icons">keyboard_arrow_up</i> <span>Show less</span>` : `<i class="material-icons">keyboard_arrow_down</i> <span>Show more</span>`}
</div>
`;
} else {
diff --git a/scripts/pages-discussions.js b/scripts/pages-discussions.js
index 4cedfa7..6a4a02d 100644
--- a/scripts/pages-discussions.js
+++ b/scripts/pages-discussions.js
@@ -44,10 +44,10 @@
if ((dtps.selectedClass == classNum) && (dtps.selectedContent == "discuss")) {
//Render sidebar
jQuery(".sidebar").html(/*html*/`
- <div class="bigLogo" style="text-align: center; margin: 10px 0 20px; height: 38px;">
+ <div class="title">
<i style="font-size: 28px; margin-right: 7px; vertical-align: middle;" class="material-icons">forum</i>
- <h4 style="color: var(--text); display: inline-block; font-size: 26px; vertical-align: middle; margin: 0px;">Discussions</h4>
- </div>
+ <h4>Discussions</h4>
+ </div>
<div class="items">
<div class="spinner"></div>
@@ -66,11 +66,8 @@
if (dtps.classes[classNum].discussions.length == 0) {
//No discussion topics in this class
jQuery(".sidebar .items").html(/*html*/`
- <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="class item main back">
- <span class="label">Classes</span>
- <div class="icon">
- <i class="material-icons">keyboard_arrow_left</i>
- </div>
+ <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="item main back">
+ <i class="material-icons">keyboard_arrow_left</i> <span class="label">Classes</span>
</div>
<p style="text-align: center; font-weight: bold; margin-top: 60px; margin-bottom: 10px;">No discussions found</p>
@@ -81,10 +78,8 @@
var discussionHTML = dtps.classes[classNum].discussions.map(discussionThread => {
return /*html*/`
<div data-threadID="${discussionThread.id}" class="item">
+ <i class="material-icons">${discussionThread.locked ? "lock_outline" : "chat_bubble_outline"}</i>
<span class="label">${discussionThread.title}</span>
- <div class="icon">
- <i class="material-icons">${discussionThread.locked ? "lock_outline" : "chat_bubble_outline"}</i>
- </div>
</div>
`;
}).join("");
@@ -92,20 +87,15 @@
//Render discussion threads in the sidebar
if ((dtps.selectedClass == classNum) && (dtps.selectedContent == "discuss")) {
jQuery(".sidebar .items").html(/*html*/`
- <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="class item main back">
- <span class="label">Classes</span>
- <div class="icon">
- <i class="material-icons">keyboard_arrow_left</i>
- </div>
- </div>
+ <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="item main back">
+ <i class="material-icons">keyboard_arrow_left</i> <span class="label">Classes</span>
+ </div>
${
dtps.classes[classNum].newDiscussionThreadURL ? (/*html*/`
- <div onclick="window.open('${dtps.classes[classNum].newDiscussionThreadURL}')" class="class item back">
+ <div onclick="window.open('${dtps.classes[classNum].newDiscussionThreadURL}')" class="item back">
+ <i class="material-icons">add</i>
<span class="label">New discussion</span>
- <div class="icon">
- <i class="material-icons">add</i>
- </div>
</div>
`) : ""
}
@@ -302,11 +292,11 @@
if ((dtps.selectedClass == classNum) && (dtps.selectedContent == "pages")) {
//Render sidebar
jQuery(".sidebar").html(/*html*/`
- <div class="bigLogo" style="text-align: center; margin: 10px 0 20px; height: 38px;">
+ <div class="title">
<i style="font-size: 28px; margin-right: 7px; vertical-align: middle;" class="material-icons">insert_drive_file</i>
- <h4 style="color: var(--text); display: inline-block; font-size: 26px; vertical-align: middle; margin: 0px;">Pages</h4>
- </div>
-
+ <h4>Pages</h4>
+ </div>
+
<div class="items">
<div class="spinner"></div>
</div>
@@ -323,11 +313,9 @@
if (pagesData.length == 0) {
//No pages in this class
jQuery(".sidebar .items").html(/*html*/`
- <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="class item main back">
+ <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="item main back">
+ <i class="material-icons">keyboard_arrow_left</i>
<span class="label">Classes</span>
- <div class="icon">
- <i class="material-icons">keyboard_arrow_left</i>
- </div>
</div>
<p style="text-align: center; font-weight: bold; margin-top: 60px; margin-bottom: 10px;">No pages found</p>
@@ -338,10 +326,8 @@
var pageHTML = dtps.classes[classNum].pages.map(page => {
return /*html*/`
<div data-pageID="${page.id}" class="item ${(defaultPage && (page.id == defaultPage)) ? "active" : ""}">
+ <i class="material-icons">insert_drive_file</i>
<span class="label">${page.title}</span>
- <div class="icon">
- <i class="material-icons">insert_drive_file</i>
- </div>
</div>
`;
}).join("");
@@ -349,11 +335,9 @@
//Render discussion threads in the sidebar
if ((dtps.selectedClass == classNum) && (dtps.selectedContent == "pages")) {
jQuery(".sidebar .items").html(/*html*/`
- <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="class item main back">
+ <div onclick="fluid.screen('stream', '${dtps.classes[classNum].id}');" class="item main back">
+ <i class="material-icons">keyboard_arrow_left</i>
<span class="label">Classes</span>
- <div class="icon">
- <i class="material-icons">keyboard_arrow_left</i>
- </div>
</div>
<div class="divider"></div>