From 1200f5d08ae259c98d7767bc3612936f59d21205 Mon Sep 17 00:00:00 2001 From: HW Computer Date: Mon, 24 Apr 2023 18:51:42 -0500 Subject: [PATCH 1/4] Switching depending on semester --- index.html | 9 +++++---- main.css | 7 ++++--- main.js | 28 ++++++++++++++++++++++++---- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 477aae4..f67a6a8 100644 --- a/index.html +++ b/index.html @@ -60,10 +60,11 @@
- + + + +

diff --git a/main.css b/main.css index a4494aa..39c075b 100644 --- a/main.css +++ b/main.css @@ -14,12 +14,12 @@ main { } main h1 { - font-size: 36px; + font-size: 24px; margin: 0 0 20px 0 } main p { - font-size: 18px; + font-size: 10px; line-height: 1.5; margin: 0 0 20px 0 } @@ -63,11 +63,12 @@ footer p { border: 3px solid #f1f1f1; margin: 5px auto; position: absolute; + font-size: small; top: 15%; left: 50%; transform: translate(-50%, -50%); width: 70%; - padding: 20px; + padding: 10px; text-align: center } diff --git a/main.js b/main.js index 30db7e0..49b745d 100644 --- a/main.js +++ b/main.js @@ -15,6 +15,7 @@ async function parseName() { let className = document.getElementById('courseName').value; let classNum = document.getElementById('courseNum').value; let department = document.getElementById('courseField').value.trim(); + let semester = document.getElementById('semester').value; let departments = ''; await fetch('https://derec4.github.io/ut-grade-data/2022prefixes.json') .then(res => res.json()) @@ -32,13 +33,32 @@ async function parseName() { return; } console.log(department, classNum.toString(), className.trim()); - await PapaParse(department, classNum.toString(), className.trim()); + await PapaParse(department, classNum.toString(), className.trim(), semester); } -async function PapaParse(department, num, name) { +async function PapaParse(department, num, name, sem) { let cData = ''; - // await fetch('https://derec4.github.io/UT-Grade-Dist/2022prefixes.json'); - await fetch('https://derec4.github.io/ut-grade-data/2022%20Fall.json') + // console.log(sem); + let url = ''; + switch (sem) { + case 'f2022': + url = 'https://derec4.github.io/ut-grade-data/2022%20Fall.json'; + break; + case 's2022': + url = 'https://derec4.github.io/ut-grade-data/2022%20Fall.json'; + break; + case 'sp2022': + // Temp, change when other data sets are added + url = 'https://derec4.github.io/ut-grade-data/2022%20Fall.json'; + break; + case 'f2021': + url = 'https://derec4.github.io/ut-grade-data/2022%20Fall.json'; + break; + default: + url = 'https://derec4.github.io/ut-grade-data/2022%20Fall.json'; + break; + } + await fetch(url) .then(res => res.json()) .then(data => { cData = data; }); From fb8fc6fc01bdde94137b3db2f2b074ab05468489 Mon Sep 17 00:00:00 2001 From: HW Computer Date: Mon, 24 Apr 2023 18:53:28 -0500 Subject: [PATCH 2/4] Docs --- main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 49b745d..dd43161 100644 --- a/main.js +++ b/main.js @@ -9,7 +9,7 @@ var gradeChart; const ctx = document.getElementById("gradeBar"); /* - Parse the name + Parse the input form and class data */ async function parseName() { let className = document.getElementById('courseName').value; @@ -36,6 +36,9 @@ async function parseName() { await PapaParse(department, classNum.toString(), className.trim(), semester); } +/* + Fetch the necessary database depending on semester and filter based on the input data +*/ async function PapaParse(department, num, name, sem) { let cData = ''; // console.log(sem); From fd310e3c489155643a76bef34151d62c8541cc59 Mon Sep 17 00:00:00 2001 From: HW Computer Date: Mon, 24 Apr 2023 19:10:34 -0500 Subject: [PATCH 3/4] oops --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index dd43161..3ac5008 100644 --- a/main.js +++ b/main.js @@ -76,7 +76,7 @@ async function PapaParse(department, num, name, sem) { } if(selectedClass.length == 0) { // Still can't find anything? Just exit without making a chart and alert that nothing could be found - alert("No data found on " + className); + alert("No data found"); return; } From bd5f44e41c6a8e379d98b50f178f2191618202a0 Mon Sep 17 00:00:00 2001 From: HW Computer Date: Tue, 25 Apr 2023 00:03:24 -0500 Subject: [PATCH 4/4] Icon url fi;xed --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f67a6a8..506cba4 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ UT Grade Viewer - +