diff --git a/performance_report.css b/performance_report.css index cd55b82..4f0596a 100644 --- a/performance_report.css +++ b/performance_report.css @@ -68,10 +68,10 @@ html, body { #avatar_text{ font-family: Helvetica Neue; font-style: normal; - font-weight: normal; + font-weight: bold; font-size: 20px; float: right; - margin-right: 15px; + margin-right: 5px; margin-top: -20px; color: rgba(0,0,0,1); } @@ -80,7 +80,7 @@ html, body { width: 300px; height: 40px; margin-left: -50px; - background-color: white; + background: white; border-radius: 25px; margin-bottom: 10px; border-top-left-radius: 0px; @@ -92,7 +92,6 @@ html, body { position: absolute; margin-top: 100px; left: 50px; - } .sidenavweek { @@ -112,6 +111,10 @@ html, body { fill: black; } +#sidebarquiz { + font-weight: bold; +} + #quiz_card { fill: rgba(255,255,255,1); position: absolute; @@ -124,17 +127,34 @@ html, body { #quiz_content { position: absolute; height: auto; + width: 750px; margin-left: auto; margin-right: auto; background-color: white; border-radius: 25px; margin-bottom: 30px; - top: 150px; + top: 130px; + left: -75px; padding-right: 30px; padding-left: 30px; /* left: calc(50% - 300px); */ } +#links { + position: fixed; + height: auto; + margin-left: 25px; + margin-right: 25px; + background-color: white; + border-radius: 25px; + margin-bottom: 30px; + top: 130px; + left: 67.5%; + padding-left: 15px; + padding-right: 15px; + text-align: center; +} + #quiz_options { position: relative; display: block; @@ -146,7 +166,7 @@ html, body { font-style: normal; font-weight: bold; margin-top: 20px; - font-size: 35px; + font-size: 40px; color: orange; } @@ -156,7 +176,7 @@ html, body { font-family: Helvetica Neue; font-style: normal; font-weight: bold; - font-size: 25px; + font-size: 30px; color: rgba(0,0,0,1); } @@ -195,6 +215,66 @@ html, body { color: slateblue; } +.question_number { + width: 155px; + white-space: nowrap; + text-align: left; + font-family: Helvetica Neue; + font-style: normal; + font-weight: bold; + font-size: 30px; + color: rgba(112,112,112,1); +} + .question { + text-align: left; + font-family: Helvetica Neue; margin-bottom: 3px; } + +#links_heading { + margin-top: 15px; +} + +#link1 { + margin-right: 10px; + margin-bottom: 15px; +} + +#link2 { + display: inline-block; + margin-bottom: 15px; + left: 60%; +} + +#summary { + text-align: justify; +} + +#ytvideo { + display: block; + margin: auto; + padding-bottom: 15px; +} + +#skill_rating { + margin-top: 10px; + width: max-content; + font-weight: bold; + font-size: 30px; +} + +#overview { + border-radius: 25px; + padding-left: 10px; + padding-right: 10px; + padding-top: 10px; + padding-bottom: 10px; + margin: -15px; +} + +#no_of_questions { + color: rgba(108, 122, 137, 1); + font-weight: normal; + font-size: 27px; +} \ No newline at end of file diff --git a/performance_report.html b/performance_report.html index 71204ee..64e4592 100644 --- a/performance_report.html +++ b/performance_report.html @@ -21,8 +21,8 @@

Raphael Low
Student

-
-
+
+
@@ -31,14 +31,14 @@ - + Week 0 - - + + Lecture 1 Lecture 2 Lecture 3 - Quiz + Quiz Week 1 Week 2 Week 3 @@ -47,32 +47,42 @@
-
-
+
+
Alkanes (C1003)
Performance Report
-
+
25 Questions
+
-

General Overview

-

Score

-

Skill Rating

-
Great Job!
-
-

Breakdown of Questions Attempted by Skillset

-
-
-
-

Breakdown of Questions Attempted by Difficulty

-
-
-
-

Breakdown of Individual Questions

-
+
+

Skill Rating

+

Score

+

Great Job!

+
+ +

Skillsets Tested

+
+
+
+

Difficulty Spread

+
+
+
+

Breakdown of Individual Questions

+
-
+ + diff --git a/quiz.css b/quiz.css index 8acf269..176b44c 100644 --- a/quiz.css +++ b/quiz.css @@ -147,7 +147,7 @@ html, body { font-style: normal; font-weight: bold; margin-top: 20px; - font-size: 35px; + font-size: 40px; color: orange; } @@ -157,10 +157,14 @@ html, body { font-family: Helvetica Neue; font-style: normal; font-weight: bold; - font-size: 25px; + font-size: 30px; color: rgba(0,0,0,1); } +#sidebarquiz { + font-weight: bold; +} + #nextbutton { position: relative; margin-top: 40px; @@ -186,17 +190,19 @@ html, body { } .progress { + margin-top: 10px; position: relative; - top: 120px; - left: 750px; - -webkit-transform-origin: 0 100%; + /* top: 120px; */ + left: auto; + width: auto; + /* -webkit-transform-origin: 0 100%; -webkit-transform: rotate(90deg); -moz-transform-origin: 0 100%; -moz-transform: rotate(90deg); -ms-transform-origin: 0 100%; -ms-transform: rotate(90deg); transform-origin: 0 100%; - transform: rotate(90deg); + transform: rotate(90deg); */ } diff --git a/quizpage.html b/quizpage.html index 3f32254..9ed0870 100644 --- a/quizpage.html +++ b/quizpage.html @@ -31,12 +31,12 @@ Week 0 - - + + Lecture 1 Lecture 2 Lecture 3 - Quiz + Quiz Week 1 Week 2 Week 3 @@ -50,12 +50,13 @@
-
-
-
+
Alkanes (C1003)
25 Questions | 30 Minutes
+
+
+

@@ -249,6 +250,13 @@ const jsonStr = JSON.stringify(questionsToBe) const obj = JSON.parse(jsonStr) + if (isFinalCalc > 1) { + currentAverage = obj.currentAverage + currentLower = obj.currentLower + currentUpper = obj.currentUpper + } + + if (isFinalCalc <= 5) { const obj2 = JSON.parse(obj.data) // console.log(obj.id_of_qn) @@ -269,9 +277,6 @@ if (isFinalCalc > 1) { list1 = Object.values(list) // console.log(typeof list1) - currentAverage = obj.currentAverage - currentLower = obj.currentLower - currentUpper = obj.currentUpper } if (obj.currentAverage < 1.9) { @@ -311,6 +316,8 @@ } } + + // console.log(list1) // console.log(array) for (let i=0; i < array.length; i++) { @@ -319,6 +326,13 @@ filteredArray.push(array[i]) } } + + if (filteredArray.length < 5) { + filteredArray.push(array[21]) + filteredArray.push(array[16]) + filteredArray.push(array[20]) + } + // console.log(filteredArray.length) // console.log(filteredArray) } @@ -337,12 +351,12 @@ console.log("<---SUBSECTION--->") console.log("currentLower: " + currentLower) - console.log("currentAverage: " + ((currentUpper + currentLower) / 2).toFixed(3)) + console.log("currentAverage: " + currentAverage) console.log("currentUpper: " + currentUpper) if (isFinalCalc == 6) { - localStorage.setItem("currentAverage", ((currentUpper + currentLower) / 2).toFixed(3)) + localStorage.setItem("currentAverage", currentAverage) window.open('./performance_report.html') return }