spanish-quizzer

commit ba24b3c23491259d57bed403c852e5b9e35940f9
parent 316d64cfcf2b13cb5b4c0622a6ec849f3101c219
Author: Asher Morgan <Asherfmorgan@gmail.com>
Date:   Sun, 15 Mar 2020 10:00:55 -0700

Implement new vocab.

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

2 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -22,7 +22,7 @@ function Load() {
     });
 
     // Load CSV
-    Sets = [null, null];
+    Sets = [null, null, null, null, null, null];
     Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Verbs.csv", {
         download: true,
         complete: function(results) {
@@ -37,6 +37,34 @@ function Load() {
             Sets[1] = results.data;
         }
     });
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Nature.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", {
+        download: true,
+        complete: function(results) {
+            // Set verbs
+            Sets[3] = results.data;
+        }
+    });
+    Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.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", {
+        download: true,
+        complete: function(results) {
+            // Set verbs
+            Sets[5] = results.data;
+        }
+    });
 }
 
 
@@ -48,6 +76,10 @@ function Start()
     Terms = [];
     Terms.push(...Filter.GetFilter(document.getElementById("mode0").value).Apply(Sets[0]));
     Terms.push(...Filter.GetFilter(document.getElementById("mode1").value).Apply(Sets[1]));
+    Terms.push(...Filter.GetFilter(document.getElementById("mode2").value).Apply(Sets[2]));
+    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]));
 
     // Validate Terms
     if (Terms.length == 0) {
diff --git a/index.html b/index.html
@@ -36,6 +36,34 @@
                     <option value="2FieldsAll">All</option>
                 </select>
             </div>
+            <div>
+                <label class="label">Nature: </label>
+                <select id="mode2">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                </select>
+            </div>
+            <div>
+                <label class="label">House: </label>
+                <select id="mode3">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                </select>
+            </div>
+            <div>
+                <label class="label">Vacation: </label>
+                <select id="mode4">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                </select>
+            </div>
+            <div>
+                <label class="label">Childhood: </label>
+                <select id="mode5">
+                    <option value="None">None</option>
+                    <option value="2FieldsAll">All</option>
+                </select>
+            </div>
             <br/>
             <button onclick="Start()">Start</button>
             <br/>