Better visibility labels and trims the department string now

This commit is contained in:
2023-04-24 18:05:12 -05:00
parent e6a0cb66c3
commit 0c7409f3e2
3 changed files with 20 additions and 9 deletions

BIN
data/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -14,6 +14,7 @@
<meta charset='utf-8'> <meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'> <meta http-equiv='X-UA-Compatible' content='IE=edge'>
<title>UT Grade Viewer</title> <title>UT Grade Viewer</title>
<link rel="icon" href="data\icon.pngs">
<meta name='viewport' content='width=device-width, initial-scale=1'> <meta name='viewport' content='width=device-width, initial-scale=1'>
<link rel='stylesheet' type='text/css' media='screen' href='main.css'> <link rel='stylesheet' type='text/css' media='screen' href='main.css'>
<script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.4.1/papaparse.min.js" <script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.4.1/papaparse.min.js"

28
main.js
View File

@@ -11,10 +11,14 @@ const ctx = document.getElementById("gradeBar");
/* /*
Parse the name Parse the name
*/ */
function parseName() { async function parseName() {
let className = document.getElementById('courseName').value; let className = document.getElementById('courseName').value;
let classNum = document.getElementById('courseNum').value; let classNum = document.getElementById('courseNum').value;
let department = document.getElementById('courseField').value; let department = document.getElementById('courseField').value.trim();
let departments = '';
await fetch('https://derec4.github.io/ut-grade-data/2022prefixes.json')
.then(res => res.json())
.then(data => { departments = data; });
if(!className && !classNum && !department) { if(!className && !classNum && !department) {
alert("At least fill out the form..."); alert("At least fill out the form...");
return; return;
@@ -23,12 +27,12 @@ function parseName() {
alert("Missing fields") alert("Missing fields")
return; return;
} }
if(department.length != 3) { if(!departments.includes(department)) {
alert("Invalid Department"); alert("Invalid Department");
return; return;
} }
console.log(department, classNum.toString(), className.trim()); console.log(department, classNum.toString(), className.trim());
PapaParse(department, classNum.toString(), className.trim()); await PapaParse(department, classNum.toString(), className.trim());
} }
async function PapaParse(department, num, name) { async function PapaParse(department, num, name) {
@@ -45,7 +49,7 @@ async function PapaParse(department, num, name) {
// Possible that the class name was typed wrong; try again with just the course number // Possible that the class name was typed wrong; try again with just the course number
console.log("Second Option"); console.log("Second Option");
selectedClass = cData.filter(cData => cData["Course Prefix"].includes(department.toUpperCase())) selectedClass = cData.filter(cData => cData["Course Prefix"].includes(department.toUpperCase()))
.filter(cData => cData["Course Title"].includes(name.toUpperCase())); .filter(cData => cData["Course Number"] == num.toString().toUpperCase());
} }
if(selectedClass.length == 0) { if(selectedClass.length == 0) {
// Still can't find anything? Just exit without making a chart and alert that nothing could be found // Still can't find anything? Just exit without making a chart and alert that nothing could be found
@@ -93,7 +97,7 @@ async function PapaParse(department, num, name) {
'D-', 'D-',
'F'], 'F'],
datasets: [{ datasets: [{
label: 'Grade Distribution', label: 'Grade distribution for \"' + selectedClass[0]["Course Title"] +"\"",
data: Object.values(gradeDist), data: Object.values(gradeDist),
borderWidth: 2, borderWidth: 2,
// borderColor: '#36A2EB', // borderColor: '#36A2EB',
@@ -102,13 +106,13 @@ async function PapaParse(department, num, name) {
}; };
gradeChart.update(); gradeChart.update();
} else { } else {
loadChart(gradeDist); loadChart(gradeDist, selectedClass[0]["Course Title"]);
aboutDiv.style.visibility='hidden'; aboutDiv.style.visibility='hidden';
chartDiv.style.display = ''; chartDiv.style.display = '';
} }
} }
function loadChart(gradeDist) { function loadChart(gradeDist, courseName) {
gradeChart = new Chart(ctx, { gradeChart = new Chart(ctx, {
type: 'bar', type: 'bar',
data: { data: {
@@ -126,13 +130,19 @@ function loadChart(gradeDist) {
'D-', 'D-',
'F'], 'F'],
datasets: [{ datasets: [{
label: 'Grade Distribution', label: 'Grade distribution for \"' + courseName + "\"",
data: Object.values(gradeDist), data: Object.values(gradeDist),
borderWidth: 2, borderWidth: 2,
backgroundColor: ["rgb(98, 244, 54)", "rgb(129, 231, 10)", "rgb(151, 218, 0)", "rgb(168, 204, 0)", "rgb(181, 190, 0)", "rgb(191, 176, 0)", "rgb(199, 162, 0)", "rgb(205, 148, 0)", "rgb(209, 133, 0)", "rgb(211, 119, 0)", "rgb(210, 105, 0)", "rgb(208, 91, 23)", "rgb(204, 78, 36)", "rgb(198, 66, 46)", "rgb(190, 54, 54)", ""], backgroundColor: ["rgb(98, 244, 54)", "rgb(129, 231, 10)", "rgb(151, 218, 0)", "rgb(168, 204, 0)", "rgb(181, 190, 0)", "rgb(191, 176, 0)", "rgb(199, 162, 0)", "rgb(205, 148, 0)", "rgb(209, 133, 0)", "rgb(211, 119, 0)", "rgb(210, 105, 0)", "rgb(208, 91, 23)", "rgb(204, 78, 36)", "rgb(198, 66, 46)", "rgb(190, 54, 54)", ""],
}] }]
}, },
options: { options: {
legend: {
labels: {
fontColor: "#00FF59",
fontSize: 15
}
},
responsive: true, responsive: true,
maintainAspectRatio: false, maintainAspectRatio: false,
scales: { scales: {