commit 5f8350cfedbe8b3daa96908205fff14db3ca9443
parent dbbae640e09b879d55b85cd609d74e90413655bb
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Tue, 17 Mar 2020 18:02:50 -0700
Implement adjectives and basic words.
Diffstat:
2 files changed, 55 insertions(+), 23 deletions(-)
diff --git a/Spanish Quizzer.js b/Spanish Quizzer.js
@@ -27,7 +27,7 @@ function Load() {
document.getElementById("settingsError").textContent = "";
// Load CSVs
- Sets = [null, null, null, null, null, null, null, null, null];
+ Sets = [null, null, 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) {
@@ -35,62 +35,76 @@ function Load() {
Sets[0] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Prepositions.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Adjectives.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[1] = 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/Prepositions.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[2] = 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/Basics.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[3] = results.data;
}
});
- Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Cloths.csv", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Weather.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[4] = 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/Family.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", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Cloths.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", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Nature.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", {
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/House.csv", {
download: true,
complete: function(results) {
// Set verbs
Sets[8] = results.data;
}
});
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Vacation.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[9] = results.data;
+ }
+ });
+ Papa.parse("https://raw.githubusercontent.com/AsherMorgan/Spanish-Quizzer/master/Vocab/Childhood.csv", {
+ download: true,
+ complete: function(results) {
+ // Set verbs
+ Sets[10] = results.data;
+ }
+ });
}
@@ -127,6 +141,8 @@ function Start() {
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode6").value).Apply(Sets[6]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode7").value).Apply(Sets[7]));
Terms.push(...Filter.GetFilter(document.getElementById("settingsMode8").value).Apply(Sets[8]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode9").value).Apply(Sets[9]));
+ Terms.push(...Filter.GetFilter(document.getElementById("settingsMode10").value).Apply(Sets[10]));
// Shuffle terms
ShuffleTerms();
diff --git a/index.html b/index.html
@@ -25,7 +25,7 @@
<br/>
<br/>
<div>
- <label class="text">Verbs: </label>
+ <label class="text" for="settingsMode0">Verbs: </label>
<select id="settingsMode0">
<option value="None">None</option>
<option value="VerbsConjugations">All Conjugations</option>
@@ -38,24 +38,21 @@
</select>
</div>
<div>
- <label class="text">Prepositions: </label>
+ <label class="text" for="settingsMode1">Adjectives: </label>
<select id="settingsMode1">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
</select>
</div>
<div>
- <label class="text">Weather: </label>
+ <label class="text" for="settingsMode2">Prepositions: </label>
<select id="settingsMode2">
<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">Family: </label>
+ <label class="text" for="settingsMode3">Basic words: </label>
<select id="settingsMode3">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
@@ -64,36 +61,35 @@
</select>
</div>
<div>
- <label class="text">Cloths: </label>
+ <label class="text" for="settingsMode4">Weather: </label>
<select id="settingsMode4">
<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">Nature: </label>
+ <label class="text" for="settingsMode5">Family: </label>
<select id="settingsMode5">
<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>
+ <label class="text" for="settingsMode6">Cloths: </label>
<select id="settingsMode6">
<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>
+ <label class="text" for="settingsMode7">Nature: </label>
<select id="settingsMode7">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
@@ -103,7 +99,7 @@
</select>
</div>
<div>
- <label class="text">Childhood: </label>
+ <label class="text" for="settingsMode8">House: </label>
<select id="settingsMode8">
<option value="None">None</option>
<option value="2FieldsAll">All</option>
@@ -112,6 +108,26 @@
<option value="2FieldsAdjectives">Adjectives</option>
</select>
</div>
+ <div>
+ <label class="text" for="settingsMode9">Vacation: </label>
+ <select id="settingsMode9">
+ <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" for="settingsMode10">Childhood: </label>
+ <select id="settingsMode10">
+ <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>
<br/>
<button onclick="Start()">Start</button>
<br/>
