spanish-quizzer

commit 1ea76d7f0e677a21c6e9e97d2498aa823037c9f7
parent dc1f7ab2baf0f343292cc18f32699637edcdf10f
Author: Asher Morgan <59518073+AsherMorgan@users.noreply.github.com>
Date:   Mon, 16 Mar 2020 11:55:07 -0700

Implement Spanish 1 vocab.

Diffstat:
M
Spanish Quizzer.js
 | 
36
++++++++++++++++++++++++++++++------
M
index.html
 | 
36
++++++++++++++++++++++++++++++++----

2 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -26,8 +26,8 @@ function Load() {
     document.getElementById("quizzer").hidden = true;
     document.getElementById("settingsError").textContent = "";
 
-    // Load CSV
-    Sets = [null, null, null, null, null, null];
+    // Load CSVs
+    Sets = [null, null, null, null, null, null, null, null, null];
     Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Verbs.csv", {
         download: true,
         complete: function(results) {
@@ -42,34 +42,55 @@ function Load() {
             Sets[1] = results.data;
         }
     });
-    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Nature.csv", {
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Weather.csv", {
         download: true,
         complete: function(results) {
             // Set verbs
             Sets[2] = results.data;
         }
     });
-    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/House.csv", {
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Family.csv", {
         download: true,
         complete: function(results) {
             // Set verbs
             Sets[3] = results.data;
         }
     });
-    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.csv", {
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Cloths.csv", {
         download: true,
         complete: function(results) {
             // Set verbs
             Sets[4] = results.data;
         }
     });
-    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Nature.csv", {
         download: true,
         complete: function(results) {
             // Set verbs
             Sets[5] = results.data;
         }
     });
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/House.csv", {
+        download: true,
+        complete: function(results) {
+            // Set verbs
+            Sets[6] = results.data;
+        }
+    });
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.csv", {
+        download: true,
+        complete: function(results) {
+            // Set verbs
+            Sets[7] = results.data;
+        }
+    });
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
+        download: true,
+        complete: function(results) {
+            // Set verbs
+            Sets[8] = results.data;
+        }
+    });
 }
 
 
@@ -85,6 +106,9 @@ function Start()
     Terms.push(...Filter.GetFilter(document.getElementById("mode3").value).Apply(Sets[3]));
     Terms.push(...Filter.GetFilter(document.getElementById("mode4").value).Apply(Sets[4]));
     Terms.push(...Filter.GetFilter(document.getElementById("mode5").value).Apply(Sets[5]));
+    Terms.push(...Filter.GetFilter(document.getElementById("mode6").value).Apply(Sets[6]));
+    Terms.push(...Filter.GetFilter(document.getElementById("mode7").value).Apply(Sets[7]));
+    Terms.push(...Filter.GetFilter(document.getElementById("mode8").value).Apply(Sets[8]));
 
     // Validate Terms
     if (Terms.length == 0) {
diff --git a/index.html b/index.html
@@ -41,7 +41,7 @@
                 </select>
             </div>
             <div>
-                <label class="text">Nature: </label>
+                <label class="text">Weather: </label>
                 <select id="mode2">
                     <option value="None">None</option>
                     <option value="2FieldsAll">All</option>
@@ -51,18 +51,46 @@
                 </select>
             </div>
             <div>
-                <label class="text">House: </label>
+                <label class="text">Family: </label>
                 <select id="mode3">
                     <option value="None">None</option>
                     <option value="2FieldsAll">All</option>
                     <option value="2FieldsNouns">Nouns</option>
+                    <option value="2FieldsAdjectives">Adjectives</option>
+                </select>
+            </div>
+            <div>
+                <label class="text">Cloths: </label>
+                <select id="mode4">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                    <option value="2FieldsNouns">Nouns</option>
+                    <option value="2FieldsAdjectives">Adjectives</option>
+                </select>
+            </div>
+            <div>
+                <label class="text">Nature: </label>
+                <select id="mode5">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                    <option value="2FieldsNouns">Nouns</option>
+                    <option value="2FieldsVerbs">Verbs</option>
+                    <option value="2FieldsAdjectives">Adjectives</option>
+                </select>
+            </div>
+            <div>
+                <label class="text">House: </label>
+                <select id="mode6">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                    <option value="2FieldsNouns">Nouns</option>
                     <option value="2FieldsVerbs">Verbs</option>
                     <option value="2FieldsAdjectives">Adjectives</option>
                 </select>
             </div>
             <div>
                 <label class="text">Vacation: </label>
-                <select id="mode4">
+                <select id="mode7">
                     <option value="None">None</option>
                     <option value="2FieldsAll">All</option>
                     <option value="2FieldsNouns">Nouns</option>
@@ -72,7 +100,7 @@
             </div>
             <div>
                 <label class="text">Childhood: </label>
-                <select id="mode5">
+                <select id="mode8">
                     <option value="None">None</option>
                     <option value="2FieldsAll">All</option>
                     <option value="2FieldsNouns">Nouns</option>