commit a0974cdbc1a857e62ff803c24674eae1be394b8e
parent 24a38473f0e300d8288e3db62a02953e89b7e15f
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Tue, 24 Mar 2020 08:14:42 -0700
Implement question vocab.
Diffstat:
2 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -77,69 +77,76 @@ function Load() {
Sets[6] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Weather.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Questions.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[7] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Family.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Weather.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[8] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Clothes.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Family.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[9] = 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/Clothes.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[10] = 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/Nature.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[11] = 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/House.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[12] = 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/Vacation.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[13] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Professions.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[14] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Health.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Professions.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[15] = results.data;
}
});
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Health.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[16] = results.data;
+ }
+ });
}
@@ -183,6 +190,7 @@ function Start() {
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode13").value).Apply(Sets[13]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode14").value).Apply(Sets[14]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode15").value).Apply(Sets[15]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode16").value).Apply(Sets[16]));
// Shuffle terms
ShuffleTerms();
diff --git a/index.html b/index.html
@@ -129,7 +129,7 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode7">Weather</label>
+ <label class="text" for="settingsMode7">Questions</label>
</td>
<td>
<select id="settingsMode7" class="settingsFilter">
@@ -137,14 +137,12 @@
<option value="2FieldsAll">All</option>
<option value="2Fields1to2">English to Spanish</option>
<option value="2Fields2to1">Spanish to English</option>
- <option value="2FieldsNouns">Nouns</option>
- <option value="2FieldsVerbs">Verbs</option>
</select>
</td>
</tr>
<tr>
<td>
- <label class="text" for="settingsMode8">Family</label>
+ <label class="text" for="settingsMode8">Weather</label>
</td>
<td>
<select id="settingsMode8" class="settingsFilter">
@@ -153,13 +151,13 @@
<option value="2Fields1to2">English to Spanish</option>
<option value="2Fields2to1">Spanish to English</option>
<option value="2FieldsNouns">Nouns</option>
- <option value="2FieldsAdjectives">Adjectives</option>
+ <option value="2FieldsVerbs">Verbs</option>
</select>
</td>
</tr>
<tr>
<td>
- <label class="text" for="settingsMode9">Clothes</label>
+ <label class="text" for="settingsMode9">Family</label>
</td>
<td>
<select id="settingsMode9" class="settingsFilter">
@@ -172,13 +170,9 @@
</select>
</td>
</tr>
- <tr><td><br/></td></tr>
- <tr>
- <td class="label" colspan="2">Spanish 2</td>
- </tr>
<tr>
<td>
- <label class="text" for="settingsMode10">Nature</label>
+ <label class="text" for="settingsMode10">Clothes</label>
</td>
<td>
<select id="settingsMode10" class="settingsFilter">
@@ -187,14 +181,17 @@
<option value="2Fields1to2">English to Spanish</option>
<option value="2Fields2to1">Spanish to English</option>
<option value="2FieldsNouns">Nouns</option>
- <option value="2FieldsVerbs">Verbs</option>
<option value="2FieldsAdjectives">Adjectives</option>
</select>
</td>
</tr>
+ <tr><td><br/></td></tr>
+ <tr>
+ <td class="label" colspan="2">Spanish 2</td>
+ </tr>
<tr>
<td>
- <label class="text" for="settingsMode11">House</label>
+ <label class="text" for="settingsMode11">Nature</label>
</td>
<td>
<select id="settingsMode11" class="settingsFilter">
@@ -210,7 +207,7 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode12">Vacation</label>
+ <label class="text" for="settingsMode12">House</label>
</td>
<td>
<select id="settingsMode12" class="settingsFilter">
@@ -226,7 +223,7 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode13">Childhood</label>
+ <label class="text" for="settingsMode13">Vacation</label>
</td>
<td>
<select id="settingsMode13" class="settingsFilter">
@@ -242,7 +239,7 @@
</tr>
<tr>
<td>
- <label class="text" for="settingsMode14">Professions</label>
+ <label class="text" for="settingsMode14">Childhood</label>
</td>
<td>
<select id="settingsMode14" class="settingsFilter">
@@ -252,12 +249,13 @@
<option value="2Fields2to1">Spanish to English</option>
<option value="2FieldsNouns">Nouns</option>
<option value="2FieldsVerbs">Verbs</option>
+ <option value="2FieldsAdjectives">Adjectives</option>
</select>
</td>
</tr>
<tr>
<td>
- <label class="text" for="settingsMode15">Health</label>
+ <label class="text" for="settingsMode15">Professions</label>
</td>
<td>
<select id="settingsMode15" class="settingsFilter">
@@ -267,6 +265,21 @@
<option value="2Fields2to1">Spanish to English</option>
<option value="2FieldsNouns">Nouns</option>
<option value="2FieldsVerbs">Verbs</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label class="text" for="settingsMode16">Health</label>
+ </td>
+ <td>
+ <select id="settingsMode16" class="settingsFilter">
+ <option value="None">None</option>
+ <option value="2FieldsAll">All</option>
+ <option value="2Fields1to2">English to Spanish</option>
+ <option value="2Fields2to1">Spanish to English</option>
+ <option value="2FieldsNouns">Nouns</option>
+ <option value="2FieldsVerbs">Verbs</option>
<option value="2FieldsAdjectives">Adjectives</option>
</select>
</td>
