From 2b2050a72914a54f2700313b0619b32db246a321 Mon Sep 17 00:00:00 2001 From: Derek Chen Date: Sat, 29 Apr 2023 05:33:58 -0500 Subject: [PATCH 1/3] simplified label --- main.js | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/main.js b/main.js index a846a2c..ba0244f 100644 --- a/main.js +++ b/main.js @@ -7,6 +7,7 @@ if(chartDiv.getAttribute('value') == 'invisible'){ } var gradeChart; const ctx = document.getElementById("gradeBar"); +const gradeLabels = ["A", "A-", "B+", "B", "B-", "C+", "C", "C-", "D+", "D", "D-", "F"]; /* Parse the input form and class data @@ -105,19 +106,7 @@ async function PapaParse(department, num, name, sem) { console.log(gradeDist); if(gradeChart) { gradeChart.config.data = { - labels: [ - 'A', - 'A-', - 'B+', - 'B', - 'B-', - 'C+', - 'C', - 'C-', - 'D+', - 'D', - 'D-', - 'F'], + labels: gradeLabels, datasets: [{ label: 'Grade distribution for \"' + selectedClass[0]["Course Title"] +"\"", data: Object.values(gradeDist), @@ -138,19 +127,7 @@ function loadChart(gradeDist, courseName) { gradeChart = new Chart(ctx, { type: 'bar', data: { - labels: [ - 'A', - 'A-', - 'B+', - 'B', - 'B-', - 'C+', - 'C', - 'C-', - 'D+', - 'D', - 'D-', - 'F'], + labels: gradeLabels, datasets: [{ label: 'Grade distribution for \"' + courseName + "\"", data: Object.values(gradeDist), From 1556395b738f29eb3992b49f68dc3edb56a0695d Mon Sep 17 00:00:00 2001 From: Derek Chen Date: Sat, 29 Apr 2023 05:43:10 -0500 Subject: [PATCH 2/3] check for multiple --- main.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index ba0244f..3883de4 100644 --- a/main.js +++ b/main.js @@ -81,6 +81,7 @@ async function PapaParse(department, num, name, sem) { } console.log(selectedClass); + let gradeDist = { "A": 0, 'A-': 0, @@ -96,10 +97,16 @@ async function PapaParse(department, num, name, sem) { 'F': 0, 'Other': 0 }; + + let lableName = selectedClass[0]["Course Title"]; + let lastClass = selectedClass[0]["Course Title"]; for(i in selectedClass) { let letterGrade = selectedClass[i]["Letter Grade"]; let cnt = selectedClass[i]["Count of letter grade"] gradeDist[letterGrade] += cnt; + if(!(lastClass === selectedClass[i]["Course Title"])) { + lableName = "Multiple courses found using the same ID; try specifying a course name!" + } // console.log(selectedClass[i]["Letter Grade"]); // console.log(selectedClass[i]["Count of letter grade"]); } @@ -108,7 +115,7 @@ async function PapaParse(department, num, name, sem) { gradeChart.config.data = { labels: gradeLabels, datasets: [{ - label: 'Grade distribution for \"' + selectedClass[0]["Course Title"] +"\"", + label: 'Grade distribution for \"' + lableName +"\"", data: Object.values(gradeDist), borderWidth: 2, // borderColor: '#36A2EB', @@ -117,7 +124,7 @@ async function PapaParse(department, num, name, sem) { }; gradeChart.update(); } else { - loadChart(gradeDist, selectedClass[0]["Course Title"]); + loadChart(gradeDist, lableName); aboutDiv.style.visibility='hidden'; chartDiv.style.display = ''; } From ef357ec1faae59ddf7ad201daa094f60f41eeb1b Mon Sep 17 00:00:00 2001 From: Derek Chen Date: Sat, 29 Apr 2023 05:45:06 -0500 Subject: [PATCH 3/3] Wait that was pretty smooth --- main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.js b/main.js index 3883de4..3bc92bf 100644 --- a/main.js +++ b/main.js @@ -99,12 +99,11 @@ async function PapaParse(department, num, name, sem) { }; let lableName = selectedClass[0]["Course Title"]; - let lastClass = selectedClass[0]["Course Title"]; for(i in selectedClass) { let letterGrade = selectedClass[i]["Letter Grade"]; let cnt = selectedClass[i]["Count of letter grade"] gradeDist[letterGrade] += cnt; - if(!(lastClass === selectedClass[i]["Course Title"])) { + if(!(lableName === selectedClass[i]["Course Title"])) { lableName = "Multiple courses found using the same ID; try specifying a course name!" } // console.log(selectedClass[i]["Letter Grade"]);