Skip to content

Commit 3d2ddff

Browse files
Matts52Matts52
committed
lint files
1 parent 785d2d0 commit 3d2ddff

18 files changed

+1163
-1128
lines changed

‎Animations/Animations.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
document.addEventListener("DOMContentLoaded", function () {
2-
2+
33
generateNavbar();
44

55
// Define an object to map option values to video sources
@@ -11,7 +11,7 @@ document.addEventListener("DOMContentLoaded", function () {
1111
"option5": "../Assets/BiasedEstimator.mp4",
1212
"option6": "../Assets/HypothesisTest.mp4"
1313
};
14-
14+
1515
// get our elements
1616
var selectBox = document.getElementById("selectBox");
1717
var videoElement = document.querySelector("video");

‎Animations/index.html

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!DOCTYPE HTML>
22
<html>
3+
34
<head>
45
<!-- Google tag (gtag.js) -->
56
<script async src="https://www.googletagmanager.com/gtag/js?id=G-C0CWMV96MD"></script>
67
<script>
78
window.dataLayer = window.dataLayer || [];
8-
function gtag(){dataLayer.push(arguments);}
9+
function gtag() { dataLayer.push(arguments); }
910
gtag('js', new Date());
1011

1112
gtag('config', 'G-C0CWMV96MD');
@@ -22,7 +23,8 @@
2223
<script type="text/javascript" src="../Scripts/navbar.js"></script>
2324

2425
</head>
25-
<body>
26+
27+
<body>
2628

2729
<!-- Simple Navbar -->
2830
<div id="navbar-container"></div>
@@ -35,23 +37,24 @@ <h1 class="title">Animations</h1>
3537
<div class="content-wide">
3638
<label for="selectBox">Select a concept:</label>
3739
<select id="selectBox">
38-
<option value="option1" selected>Discrete Expected Value</option>
39-
<option value="option2">Continuous Expected Value</option>
40-
<option value="option3">Conditional Probability</option>
41-
<option value="option4">DGP Sampling</option>
42-
<option value="option5">Biased Estimator</option>
43-
<option value="option6">Hypothesis Testing</option>
40+
<option value="option1" selected>Discrete Expected Value</option>
41+
<option value="option2">Continuous Expected Value</option>
42+
<option value="option3">Conditional Probability</option>
43+
<option value="option4">DGP Sampling</option>
44+
<option value="option5">Biased Estimator</option>
45+
<option value="option6">Hypothesis Testing</option>
4446
</select>
4547
<hr>
4648
<video width="700" height="394" controls>
47-
<source src="../Assets/ExpectedValue.mp4" type="video/mp4">
48-
Your browser does not support the video tag.
49-
</video>
49+
<source src="../Assets/ExpectedValue.mp4" type="video/mp4">
50+
Your browser does not support the video tag.
51+
</video>
5052
</div>
5153

5254

5355
<!-- my scripts -->
5456
<script type="text/javascript" src="Animations.js"></script>
5557

5658
</body>
59+
5760
</html>

‎Glossary/Glossary.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

2-
3-
42
window.onload = function () {
53

64
generateNavbar()
@@ -9,16 +7,16 @@ window.onload = function () {
97
.then(response => response.json())
108
.then(data => {
119

12-
for (var i = 0; i < data.Sheet1.length; i++){
10+
for (var i = 0; i < data.Sheet1.length; i++) {
1311
//console.log(data.Sheet1[i].Chapter);
1412
var h3 = document.createElement("p");
15-
h3.innerHTML = "<b>"+ data.Sheet1[i].Term +"</b>"
13+
h3.innerHTML = "<b>" + data.Sheet1[i].Term + "</b>"
1614
var p = document.createElement("p");
1715
p.innerHTML = data.Sheet1[i].Interpretation;
1816

1917
document.getElementById(data.Sheet1[i].Chapter).appendChild(h3).appendChild(p);
2018
}
21-
});
19+
});
2220

2321

2422
}

‎Glossary/index.html

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
<!DOCTYPE HTML>
22
<html>
3+
34
<head>
45
<!-- Google tag (gtag.js) -->
56
<script async src="https://www.googletagmanager.com/gtag/js?id=G-C0CWMV96MD"></script>
67
<script>
78
window.dataLayer = window.dataLayer || [];
8-
function gtag(){dataLayer.push(arguments);}
9+
function gtag() { dataLayer.push(arguments); }
910
gtag('js', new Date());
1011

1112
gtag('config', 'G-C0CWMV96MD');
1213
</script>
1314

1415
<link rel="stylesheet" href="../styles.css">
1516

16-
<!-- libraries -->
17-
<script src="https://d3js.org/d3.v4.js"></script>
18-
<script type="text/javascript" src="../Scripts/StatisticalHelpers.js"></script>
19-
<script type="text/javascript" src="../Scripts/navbar.js"></script>
17+
<!-- libraries -->
18+
<script src="https://d3js.org/d3.v4.js"></script>
19+
<script type="text/javascript" src="../Scripts/StatisticalHelpers.js"></script>
20+
<script type="text/javascript" src="../Scripts/navbar.js"></script>
2021

2122
<!-- tell broswer not to cache the webpage (hopefully it listens) -->
2223
<meta http-equiv="cache-control" content="no-cache">
2324

2425
</head>
26+
2527
<body>
2628

2729
<!-- Simple Navbar -->
@@ -42,8 +44,10 @@
4244
<div id="Chapter 11" class="glosspara"></div>
4345

4446

45-
46-
<p class="disclaimer">Intuitive explanations generated by the ChatGPT converstional AI <a href="https://chat.openai.com/">Link</a>. Small Bugs or oversights in the information provided may be present, fixes are encouraged in the <a href = "https://github.com/Matts52/ECO304_Calculators">Github repository!</a></p>
47+
48+
<p class="disclaimer">Intuitive explanations generated by the ChatGPT converstional AI <a
49+
href="https://chat.openai.com/">Link</a>. Small Bugs or oversights in the information provided may be present,
50+
fixes are encouraged in the <a href="https://github.com/Matts52/ECO304_Calculators">Github repository!</a></p>
4751

4852

4953
<!-- scripts -->

‎Grades/GradeCalculate.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ window.onload = function () {
3030
let min = 101;
3131
let minInd = -1;
3232
let containMissing = false
33-
for (let i = 0; i < assignments.length; i++){
33+
for (let i = 0; i < assignments.length; i++) {
3434
//check for missing assignments
35-
if (assignments[i] == ""){
35+
if (assignments[i] == "") {
3636
containMissing = true;
3737
break;
3838
}
3939

40-
if (Number(assignments[i]) <= min){
40+
if (Number(assignments[i]) <= min) {
4141
min = assignments[i];
4242
minInd = i;
4343
}
4444
}
4545

4646
//remove the empty or lowest assignment
47-
if (containMissing){
47+
if (containMissing) {
4848
assignments = assignments.filter(a => a !== "");
4949
} else {
5050
assignments.splice(minInd, 1);
@@ -54,13 +54,13 @@ window.onload = function () {
5454
labs = labs.filter(a => a !== "");
5555

5656
//go through each assignment
57-
for (let i = 0; i < assignments.length; i++){
57+
for (let i = 0; i < assignments.length; i++) {
5858
totalGrade += assignments[i] * weights[0];
5959
totalWeight += weights[0];
6060
}
6161

6262
//go through each lab
63-
for (let i = 0; i < labs.length; i++){
63+
for (let i = 0; i < labs.length; i++) {
6464
totalGrade += labs[i] * weights[1];
6565
totalWeight += weights[1];
6666
}
@@ -72,21 +72,21 @@ window.onload = function () {
7272
//}
7373

7474
//add in the final
75-
if (midterm != ""){
75+
if (midterm != "") {
7676
totalGrade += midterm * weights[2];
7777
totalWeight += weights[2];
7878
}
7979

8080
//add in the final
81-
if (final != ""){
81+
if (final != "") {
8282
totalGrade += final * weights[3];
8383
totalWeight += weights[3];
8484
}
8585

8686
console.log(totalGrade, totalWeight)
8787

88-
document.getElementById("gradecalc_curr").innerHTML = "Your current grade is <b>"+(Math.round(((totalGrade/100)/totalWeight)*1000)/10).toString()+"%</b> \
89-
based on "+Math.round((totalWeight*1000)/10).toString()+"% of the graded course material.";
88+
document.getElementById("gradecalc_curr").innerHTML = "Your current grade is <b>" + (Math.round(((totalGrade / 100) / totalWeight) * 1000) / 10).toString() + "%</b> \
89+
based on "+ Math.round((totalWeight * 1000) / 10).toString() + "% of the graded course material.";
9090

9191
}
9292

‎Grades/index.html

+67-64
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<!DOCTYPE HTML>
22
<html>
3+
34
<head>
45
<!-- Google tag (gtag.js) -->
56
<script async src="https://www.googletagmanager.com/gtag/js?id=G-C0CWMV96MD"></script>
67
<script>
78
window.dataLayer = window.dataLayer || [];
8-
function gtag(){dataLayer.push(arguments);}
9+
function gtag() { dataLayer.push(arguments); }
910
gtag('js', new Date());
1011

1112
gtag('config', 'G-C0CWMV96MD');
@@ -20,86 +21,88 @@
2021
<script type="text/javascript" src="../Scripts/navbar.js"></script>
2122

2223
</head>
24+
2325
<body>
2426

2527
<!-- Simple Navbar -->
2628
<div id="navbar-container"></div>
2729

2830

29-
<!-- Grade Calculator -->
31+
<!-- Grade Calculator -->
3032
<h1 class="title">ECO304 Grade Calculator</h1>
3133
<hr class="style-eight grades">
3234

33-
<table class="gradetable">
34-
<thead>
35-
<tr>
36-
<th>Material</th>
37-
<th>Percent Score (out of 100%)</th>
38-
</tr>
39-
</thead>
40-
<tbody>
41-
<tr>
42-
<td>A1:</td>
43-
<td><input type="number" id="A1Grade"></td>
44-
</tr>
45-
<tr>
46-
<td>A2:</td>
47-
<td><input type="number" id="A2Grade"></td>
48-
</tr>
49-
<tr>
50-
<td>A3:</td>
51-
<td><input type="number" id="A3Grade"></td>
52-
</tr>
53-
<tr>
54-
<td>A4:</td>
55-
<td><input type="number" id="A4Grade"></td>
56-
</tr>
57-
<tr>
58-
<td>A5:</td>
59-
<td><input type="number" id="A5Grade"></td>
60-
</tr>
61-
<tr>
62-
<td>A6:</td>
63-
<td><input type="number" id="A6Grade"></td>
64-
</tr>
65-
<tr>
66-
<td>L1:</td>
67-
<td><input type="number" id="L1Grade"></td>
68-
</tr>
69-
<tr>
70-
<td>L2:</td>
71-
<td><input type="number" id="L2Grade"></td>
72-
</tr>
73-
<tr>
74-
<td>L3:</td>
75-
<td><input type="number" id="L3Grade"></td>
76-
</tr>
77-
<!--
35+
<table class="gradetable">
36+
<thead>
37+
<tr>
38+
<th>Material</th>
39+
<th>Percent Score (out of 100%)</th>
40+
</tr>
41+
</thead>
42+
<tbody>
43+
<tr>
44+
<td>A1:</td>
45+
<td><input type="number" id="A1Grade"></td>
46+
</tr>
47+
<tr>
48+
<td>A2:</td>
49+
<td><input type="number" id="A2Grade"></td>
50+
</tr>
51+
<tr>
52+
<td>A3:</td>
53+
<td><input type="number" id="A3Grade"></td>
54+
</tr>
55+
<tr>
56+
<td>A4:</td>
57+
<td><input type="number" id="A4Grade"></td>
58+
</tr>
59+
<tr>
60+
<td>A5:</td>
61+
<td><input type="number" id="A5Grade"></td>
62+
</tr>
63+
<tr>
64+
<td>A6:</td>
65+
<td><input type="number" id="A6Grade"></td>
66+
</tr>
67+
<tr>
68+
<td>L1:</td>
69+
<td><input type="number" id="L1Grade"></td>
70+
</tr>
71+
<tr>
72+
<td>L2:</td>
73+
<td><input type="number" id="L2Grade"></td>
74+
</tr>
75+
<tr>
76+
<td>L3:</td>
77+
<td><input type="number" id="L3Grade"></td>
78+
</tr>
79+
<!--
7880
<tr>
7981
<td>Attendance:</td>
8082
<td><input type="number" id="AGrade"></td>
8183
</tr>
8284
-->
83-
<tr>
84-
<td>Midterm:</td>
85-
<td><input type="number" id="MGrade"></td>
86-
</tr>
87-
<tr>
88-
<td>Final:</td>
89-
<td><input type="number" id="FGrade"></td>
90-
</tr>
91-
</tbody>
92-
</table>
85+
<tr>
86+
<td>Midterm:</td>
87+
<td><input type="number" id="MGrade"></td>
88+
</tr>
89+
<tr>
90+
<td>Final:</td>
91+
<td><input type="number" id="FGrade"></td>
92+
</tr>
93+
</tbody>
94+
</table>
9395

94-
<div class="pad-qs"></div>
95-
<div class="content">
96-
<input class="button-68" type="button" id="calcGrade" value="Generate Grade">
97-
<p id="gradecalc_curr"></p>
98-
</div>
96+
<div class="pad-qs"></div>
97+
<div class="content">
98+
<input class="button-68" type="button" id="calcGrade" value="Generate Grade">
99+
<p id="gradecalc_curr"></p>
100+
</div>
99101

100-
<p class="disclaimer">Calculations are subject to round-off error and other computational imprecisions and are used for gauging purposes only</p>
102+
<p class="disclaimer">Calculations are subject to round-off error and other computational imprecisions and are used
103+
for gauging purposes only</p>
101104

102105
<!-- scripts -->
103106
<script type="text/javascript" src="GradeCalculate.js"></script>
104107

105-
</body>
108+
</body>

0 commit comments

Comments
 (0)